diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d6647b92..5f3162ca 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ on:
 # uncomment env below and define git revisions in ./scripts/custom-runtime.sh
 
 env:
-  IPFS_GO_EXEC: /tmp/go-ipfs/cmd/ipfs/ipfs
+  #IPFS_GO_EXEC: /tmp/go-ipfs/cmd/ipfs/ipfs
   IPFS_JS_EXEC: /tmp/js-ipfs/packages/ipfs/src/cli.js
   IPFS_JS_MODULE: /tmp/js-ipfs/packages/ipfs/dist/cjs/src/index.js
   IPFS_JS_HTTP_MODULE: /tmp/js-ipfs/packages/ipfs-http-client/dist/cjs/src/index.js
diff --git a/.gitignore b/.gitignore
index 383b0343..7cf9a2b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,4 +39,5 @@ test/test-data/go-ipfs-repo/LOG
 test/test-data/go-ipfs-repo/LOG.old
 types
 go-libp2p-relay-daemon
-*.identity
\ No newline at end of file
+scripts/libp2p-relay-daemon
+*.identity
diff --git a/package-lock.json b/package-lock.json
index 7409ef89..41876514 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -46,7 +46,7 @@
       },
       "devDependencies": {
         "execa": "^5.1.1",
-        "go-ipfs": "^0.9.1",
+        "go-ipfs": "0.11.0-rc1",
         "ipfs": "^0.59.0",
         "ipfs-http-client": "^53.0.0"
       },
@@ -10162,9 +10162,9 @@
       }
     },
     "node_modules/go-ipfs": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/go-ipfs/-/go-ipfs-0.9.1.tgz",
-      "integrity": "sha512-69sDGENU7xEPDNytEzE+swKTNSLr+OJEfdEYQ41m91dzNyHyxABB4Rteg4uzsj34lTizjVI1m7Gld3g5Dgf6Ag==",
+      "version": "0.11.0-rc1",
+      "resolved": "https://registry.npmjs.org/go-ipfs/-/go-ipfs-0.11.0-rc1.tgz",
+      "integrity": "sha512-fw2eCBSspqLH1kE5QP9CmC8UU4+q2jnTPXsocfL3qlzj/dzWMiLoc6bzMHoNcai54k74u83a1hqb4cKyxZLL3w==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -29448,9 +29448,9 @@
       }
     },
     "go-ipfs": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/go-ipfs/-/go-ipfs-0.9.1.tgz",
-      "integrity": "sha512-69sDGENU7xEPDNytEzE+swKTNSLr+OJEfdEYQ41m91dzNyHyxABB4Rteg4uzsj34lTizjVI1m7Gld3g5Dgf6Ag==",
+      "version": "0.11.0-rc1",
+      "resolved": "https://registry.npmjs.org/go-ipfs/-/go-ipfs-0.11.0-rc1.tgz",
+      "integrity": "sha512-fw2eCBSspqLH1kE5QP9CmC8UU4+q2jnTPXsocfL3qlzj/dzWMiLoc6bzMHoNcai54k74u83a1hqb4cKyxZLL3w==",
       "dev": true,
       "requires": {
         "cachedir": "^2.3.0",
diff --git a/package.json b/package.json
index 57259cc1..ba1c3341 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "npm": ">6.0.0"
   },
   "scripts": {
-    "postinstall": "./scripts/setup-relayd.sh",
+    "postinstall": "./scripts/setup-libp2p-relay-daemon.sh",
     "clean": "rimraf /tmp/js-ipfs /tmp/go-ipfs ./go-libp2p-relay-daemon",
     "lint": "aegir lint",
     "build": "aegir build",
@@ -102,7 +102,7 @@
   ],
   "devDependencies": {
     "execa": "^5.1.1",
-    "go-ipfs": "^0.9.1",
+    "go-ipfs": "0.11.0-rc1",
     "ipfs": "^0.59.0",
     "ipfs-http-client": "^53.0.0"
   }
diff --git a/scripts/setup-libp2p-relay-daemon.sh b/scripts/setup-libp2p-relay-daemon.sh
new file mode 100755
index 00000000..cabaf39f
--- /dev/null
+++ b/scripts/setup-libp2p-relay-daemon.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# This script ensures go-libp2p-relay-daemon is available
+# for use in  circuit v1 and v2 tests.
+
+set -eo pipefail
+
+if ! test -e ./scripts/libp2p-relay-daemon; then
+    echo "Fetching ./scripts/libp2p-relay-daemon binary.."
+    GOBIN=$(realpath ./scripts) go install github.com/libp2p/go-libp2p-relay-daemon/cmd/libp2p-relay-daemon@v0.1.0
+    echo "./scripts/libp2p-relay-daemon is ready"
+fi
diff --git a/scripts/setup-relayd.sh b/scripts/setup-relayd.sh
deleted file mode 100755
index e23466d0..00000000
--- a/scripts/setup-relayd.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-# This script ensures go-libp2p-relay-daemon is available
-# for use in  circuit v1 and v2 tests.
-
-set -eo pipefail
-
-if ! test -e ./go-libp2p-relay-daemon/relayd; then
-    echo "Building ./go-libp2p-relay-daemon/relayd binary.."
-    rm -rf ./go-libp2p-relay-daemon
-    git clone https://github.com/libp2p/go-libp2p-relay-daemon.git
-    cd go-libp2p-relay-daemon
-    # no releases atm, so we pin implementation to specific commit
-    git checkout 65211a0b6d881086feb7c386d780f55c37dff101 # 2021-11-19
-    go build ./...
-    echo "./go-libp2p-relay-daemon/relayd is ready"
-fi
diff --git a/test/utils/relayd.js b/test/utils/relayd.js
index 7af38078..3a4e32d8 100644
--- a/test/utils/relayd.js
+++ b/test/utils/relayd.js
@@ -12,7 +12,7 @@ export async function getRelayV (version, factory) {
   if (relays.has(version)) return relays.get(version)
   if (process.env.DEBUG) console.log(`Starting relayd_v${version}..`) // eslint-disable-line no-console
   if (version < 1 || version > 2) throw new Error('Unsupported circuit relay version')
-  const relayd = command(`go-libp2p-relay-daemon/relayd -config scripts/relayd_v${version}.config.json -id scripts/relayd_v${version}.identity`)
+  const relayd = command(`scripts/libp2p-relay-daemon -config scripts/relayd_v${version}.config.json -id scripts/relayd_v${version}.identity`)
   let id
   for await (const line of relayd.stdout) {
     const text = line.toString()