diff --git a/Cargo.lock b/Cargo.lock
index c811f643f4..699f2940a6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1076,9 +1076,9 @@ dependencies = [
 
 [[package]]
 name = "enr"
-version = "0.1.0-alpha.7"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266c26f4eec6f07787274ddb813bb91355eeea7c094113d2d81ddd6330af1334"
+checksum = "ca3cd1bccf1bd78eee44d89c0f81b60008b40153db2b99c0fc01abf353781e13"
 dependencies = [
  "base64 0.12.1",
  "bs58",
@@ -1189,10 +1189,12 @@ dependencies = [
  "base64 0.12.1",
  "dirs",
  "discv5",
+ "environment",
  "error-chain",
  "eth2_ssz",
  "eth2_ssz_derive",
  "eth2_ssz_types",
+ "exit-future",
  "fnv",
  "futures 0.3.5",
  "hashset_delay",
@@ -1323,7 +1325,7 @@ dependencies = [
 name = "eth2_testnet_config"
 version = "0.2.0"
 dependencies = [
- "eth2-libp2p",
+ "enr",
  "eth2_ssz",
  "reqwest",
  "serde",
diff --git a/beacon_node/eth2-libp2p/src/service.rs b/beacon_node/eth2-libp2p/src/service.rs
index 97556dd55d..0ba88b3978 100644
--- a/beacon_node/eth2-libp2p/src/service.rs
+++ b/beacon_node/eth2-libp2p/src/service.rs
@@ -84,7 +84,7 @@ pub struct Service<TSpec: EthSpec> {
 
 impl<TSpec: EthSpec> Service<TSpec> {
     pub fn new(
-        handle: tokio::runtime::Handle,
+        handle: environment::TaskExecutor,
         config: &NetworkConfig,
         enr_fork_id: EnrForkId,
         log: &slog::Logger,
@@ -123,10 +123,10 @@ impl<TSpec: EthSpec> Service<TSpec> {
             let behaviour = Behaviour::new(&local_keypair, config, network_globals.clone(), &log)?;
 
             // use the executor for libp2p
-            struct Executor(tokio::runtime::Handle);
+            struct Executor(environment::TaskExecutor);
             impl libp2p::core::Executor for Executor {
                 fn exec(&self, f: Pin<Box<dyn Future<Output = ()> + Send>>) {
-                    self.0.spawn(f);
+                    self.0.spawn(f, "libp2p");
                 }
             }
             SwarmBuilder::new(transport, behaviour, local_peer_id.clone())
diff --git a/beacon_node/network/src/service.rs b/beacon_node/network/src/service.rs
index 423c4a25ce..38b0779b96 100644
--- a/beacon_node/network/src/service.rs
+++ b/beacon_node/network/src/service.rs
@@ -73,7 +73,7 @@ impl<T: BeaconChainTypes> NetworkService<T> {
 
         // launch libp2p service
         let (network_globals, mut libp2p) =
-            LibP2PService::new(executor.runtime_handle(), config, enr_fork_id, &network_log)?;
+            LibP2PService::new(executor.clone(), config, enr_fork_id, &network_log)?;
 
         for enr in load_dht::<T::Store, T::EthSpec>(store.clone()) {
             libp2p.swarm.add_enr(enr);