diff --git a/packages/ipfs-http-client/.aegir.js b/packages/ipfs-http-client/.aegir.js
index 4e874f4c77..b286427a76 100644
--- a/packages/ipfs-http-client/.aegir.js
+++ b/packages/ipfs-http-client/.aegir.js
@@ -10,7 +10,7 @@ const server = createServer({
 }, {
   type: 'go',
   ipfsHttpModule: require('./'),
-  ipfsBin: require('go-ipfs-dep').path()
+  ipfsBin: require('go-ipfs').path()
 })
 
 let echoServer = new EchoServer()
diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json
index 8a58a239d8..2a7bf00109 100644
--- a/packages/ipfs-http-client/package.json
+++ b/packages/ipfs-http-client/package.json
@@ -17,7 +17,7 @@
   "browser": {
     "./src/lib/to-stream.js": "./src/lib/to-stream.browser.js",
     "ipfs-utils/src/files/glob-source": false,
-    "go-ipfs-dep": false
+    "go-ipfs": false
   },
   "repository": {
     "type": "git",
@@ -70,7 +70,7 @@
   "devDependencies": {
     "aegir": "^23.0.0",
     "cross-env": "^7.0.0",
-    "go-ipfs-dep": "^0.6.0",
+    "go-ipfs": "^0.6.0",
     "interface-ipfs-core": "^0.137.0",
     "ipfsd-ctl": "^4.1.1",
     "it-all": "^1.0.1",
diff --git a/packages/ipfs-http-client/test/utils/factory.js b/packages/ipfs-http-client/test/utils/factory.js
index fcb2c9394c..8ba97c4aec 100644
--- a/packages/ipfs-http-client/test/utils/factory.js
+++ b/packages/ipfs-http-client/test/utils/factory.js
@@ -13,7 +13,7 @@ const commonOptions = {
 
 const commonOverrides = {
   go: {
-    ipfsBin: isNode ? require('go-ipfs-dep').path() : undefined
+    ipfsBin: isNode ? require('go-ipfs').path() : undefined
   }
 }
 
diff --git a/packages/ipfs/.aegir.js b/packages/ipfs/.aegir.js
index 4b38aa15c0..a7d6d937c8 100644
--- a/packages/ipfs/.aegir.js
+++ b/packages/ipfs/.aegir.js
@@ -76,7 +76,7 @@ module.exports = {
           }
         }, {
           go: {
-            ipfsBin: require('go-ipfs-dep').path()
+            ipfsBin: require('go-ipfs').path()
           }
         }).start()
 
diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json
index 7f433c02b2..6fa3bce5f0 100644
--- a/packages/ipfs/package.json
+++ b/packages/ipfs/package.json
@@ -178,9 +178,9 @@
     "delay": "^4.3.0",
     "execa": "^4.0.0",
     "form-data": "^3.0.0",
-    "go-ipfs-dep": "^0.6.0",
+    "go-ipfs": "^0.6.0",
     "interface-ipfs-core": "^0.137.0",
-    "ipfs-interop": "^1.0.4",
+    "ipfs-interop": "ipfs/interop#chore/swap-go-ipfs-dep-for-go-ipfs",
     "ipfsd-ctl": "^4.1.1",
     "iso-random-stream": "^1.1.1",
     "it-to-buffer": "^1.0.0",