diff --git a/.github/workflows/call.test-local-subgraph.yml b/.github/workflows/call.test-local-subgraph.yml
index 5b7fd3a5dc..117d6f36c5 100644
--- a/.github/workflows/call.test-local-subgraph.yml
+++ b/.github/workflows/call.test-local-subgraph.yml
@@ -103,11 +103,11 @@ jobs:
         run: yarn prepare-local
         working-directory: ${{ env.subgraph-working-directory }}
 
-      - name: Run setup-graph-node
-        if: steps.base.outputs.cache-hit != 'true'
-        run: |
-          ./tasks/setup-graph-node.sh
-        working-directory: ${{ env.subgraph-working-directory }}
+        # - name: Run setup-graph-node
+        #   if: steps.base.outputs.cache-hit != 'true'
+        #   run: |
+        #     ./tasks/setup-graph-node.sh
+        #   working-directory: ${{ env.subgraph-working-directory }}
 
       - name: Docker compose
         if: steps.base.outputs.cache-hit != 'true'
diff --git a/packages/subgraph/docker-compose.yml b/packages/subgraph/docker-compose.yml
index fe1c1f4912..ae595ddef6 100644
--- a/packages/subgraph/docker-compose.yml
+++ b/packages/subgraph/docker-compose.yml
@@ -1,7 +1,4 @@
 services:
-  docker-host:
-    image: qoomon/docker-host
-    cap_add: [ 'NET_ADMIN', 'NET_RAW' ]
   graph-node:
     image: graphprotocol/graph-node:v0.35.0
     ports:
@@ -14,13 +11,15 @@ services:
       - docker-host
       - ipfs
       - postgres
+    extra_hosts:
+      - host.docker.internal:host-gateway
     environment:
       postgres_host: postgres
       postgres_user: graph-node
       postgres_pass: let-me-in
       postgres_db: graph-node
       ipfs: "ipfs:5001"
-      ethereum: "mainnet:http://docker-host:8545"
+      ethereum: "mainnet:http://host.docker.internal:8545"
       GRAPH_LOG: info
   ipfs:
     image: ipfs/go-ipfs:v0.4.23