diff --git a/.github/workflows/gateway-conformance.yml b/.github/workflows/gateway-conformance.yml
index 0c6a19024998..4366d567386a 100644
--- a/.github/workflows/gateway-conformance.yml
+++ b/.github/workflows/gateway-conformance.yml
@@ -129,17 +129,24 @@ jobs:
           ./ipfs config Addresses.API "/ip4/127.0.0.1/tcp/5002"
         working-directory: kubo-gateway/cmd/ipfs
 
-      # 9. Start the kubo http-p2p-proxy and setup the forwarder
-      - name: Start kubo-gateway
+      # 9. Start the kubo http-p2p-proxy
+      - name: Start kubo http-p2p-proxy
         env:
           IPFS_PATH: "~/.kubo-p2p-proxy"
         run: |
-          gatewayNodeId=$(./ipfs id -f="<id>" --api=/ip4/127.0.0.1/tcp/5001)
           ./ipfs daemon --offline &
-          ./ipfs p2p forward --allow-custom-protocol /http/1.1 /ip4/127.0.0.1/tcp/8082 /p2p/$gatewayNodeId
         working-directory: kubo-gateway/cmd/ipfs
 
-      # 10. Run the gateway-conformance tests
+      # 10. Start forwarding data from the http-p2p-proxy to the node serving the Gateway API over libp2p
+      - name: Start http-over-libp2p forwarding proxy
+        run: |
+          gatewayNodeId=$(./ipfs --api=/ip4/127.0.0.1/tcp/5001 id -f="<id>")
+          echo $gatewayNodeId
+          curl http://127.0.0.1:8081/ipfs/bafkqaaa
+          ./ipfs --api=/ip4/127.0.0.1/tcp/5002 p2p forward --allow-custom-protocol /http/1.1 /ip4/127.0.0.1/tcp/8082 /p2p/$gatewayNodeId
+        working-directory: kubo-gateway/cmd/ipfs
+
+      # 11. Run the gateway-conformance tests over libp2p
       - name: Run gateway-conformance tests over libp2p
         uses: ipfs/gateway-conformance/.github/actions/test@v0.3
         with: