diff --git a/.gitmodules b/.gitmodules
index 1d6f641..6d0ce58 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "mutinynet-faucet"]
 	path = mutinynet-faucet
 	url = https://github.com/MutinyWallet/mutinynet-faucet.git
+[submodule "electrs"]
+	path = electrs
+	url = https://github.com/MutinyWallet/electrs.git
+	branch = new-index
diff --git a/docker-compose.yml b/docker-compose.yml
index dd5e2fe..29d1c70 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,6 +24,19 @@ services:
       - "38332:38332"
       - "38333:38333"
       - "38334:38334"
+  electrs:
+    container_name: "electrs"
+    build:
+      context: ./electrs
+    user: "0:1000"
+    restart: always
+    stop_grace_period: 1m
+    environment:
+      FLAGS: '-vvvv --daemon-dir /root/.bitcoin/signet --daemon-rpc-addr bitcoin:38332 --timestamp --blocks-dir /root/.bitcoin/signet/blocks --cookie="bitcoin:$RPCPASSWORD" --db-dir /root/.electrs --network signet --http-addr 0.0.0.0:3003'
+    volumes:
+      - ~/volumes/electrs:/root/.electrs
+    ports:
+      - "3003:3003"
   faucet:
     container_name: "faucet"
     build:
@@ -56,10 +69,8 @@ services:
   api:
     container_name: "mempool_backend"
     environment:
-      MEMPOOL_BACKEND: "none"
-#      ELECTRUM_HOST: "electrs"
-#      ELECTRUM_PORT: "50001"
-#      ELECTRUM_TLS_ENABLED: "false"
+      MEMPOOL_BACKEND: "esplora"
+      ESPLORA_REST_API_URL: "http://electrs:3003"
       CORE_RPC_HOST: "bitcoind"
       CORE_RPC_PORT: "38332"
       CORE_RPC_USERNAME: "bitcoin"
diff --git a/electrs b/electrs
new file mode 160000
index 0000000..3b2d502
--- /dev/null
+++ b/electrs
@@ -0,0 +1 @@
+Subproject commit 3b2d5027aba596df5d36ca6d4c42e3d7cc89e6f1