diff --git a/nimbus.nimble b/nimbus.nimble
index 9acd73a7b..9969d163a 100644
--- a/nimbus.nimble
+++ b/nimbus.nimble
@@ -15,10 +15,11 @@ requires "nim >= 0.18.1",
          "rocksdb",
          "eth_trie",
          "https://github.com/status-im/nim-eth-common",
-         "https://github.com/status-im/nim-eth-rpc",
+         "json_rpc",
          "https://github.com/status-im/nim-asyncdispatch2",
          "eth_p2p",
-         "eth_keyfile"
+         "eth_keyfile",
+         "eth_keys"
 
 proc test(name: string, lang = "c") =
   if not dirExists "build":
diff --git a/nimbus/nimbus.nim b/nimbus/nimbus.nim
index 2f8f268ee..7a8b0bcb5 100644
--- a/nimbus/nimbus.nim
+++ b/nimbus/nimbus.nim
@@ -8,7 +8,7 @@
 # those terms.
 
 import strutils, net
-import asyncdispatch2, rpcserver, eth_p2p, eth_keys
+import asyncdispatch2, json_rpc/rpcserver, eth_p2p, eth_keys
 import config, rpc/common, rpc/p2p
 
 ## TODO:
@@ -27,7 +27,7 @@ type
     Starting, Running, Stopping, Stopped
 
   NimbusObject = ref object
-    rpcServer*: RpcServer
+    rpcServer*: RpcHttpServer
     ethNode*: EthereumNode
     state*: NimbusState
 
@@ -37,7 +37,7 @@ proc start(): NimbusObject =
 
   ## Creating RPC Server
   if RpcFlags.Enabled in conf.rpc.flags:
-    nimbus.rpcServer = newRpcServer(conf.rpc.binds)
+    nimbus.rpcServer = newRpcHttpServer(conf.rpc.binds)
     setupCommonRpc(nimbus.rpcServer)
 
   ## Creating P2P Server