diff --git a/package.json b/package.json
index dffd8e13..6df2e126 100644
--- a/package.json
+++ b/package.json
@@ -43,13 +43,13 @@
   "homepage": "https://github.com/ipfs/js-ipfs-bitswap#readme",
   "devDependencies": {
     "@nodeutils/defaults-deep": "^1.1.0",
-    "aegir": "^20.3.1",
+    "aegir": "^21.9.0",
     "async-iterator-all": "^1.0.0",
     "benchmark": "^2.1.4",
     "chai": "^4.2.0",
     "delay": "^4.3.0",
     "dirty-chai": "^2.0.1",
-    "ipfs-repo": "^0.28.2",
+    "ipfs-repo": "^2.0.0",
     "libp2p": "^0.27.0",
     "libp2p-kad-dht": "^0.18.3",
     "libp2p-mplex": "^0.9.2",
@@ -68,15 +68,15 @@
     "peer-info": "^0.17.0",
     "promisify-es6": "^1.0.3",
     "rimraf": "^3.0.0",
-    "safe-buffer": "^5.1.2",
+    "buffer": "^5.6.0",
     "stats-lite": "^2.2.0",
     "uuid": "^3.3.2"
   },
   "dependencies": {
     "bignumber.js": "^9.0.0",
-    "cids": "~0.7.0",
+    "cids": "~0.8.0",
     "debug": "^4.1.0",
-    "ipfs-block": "~0.8.0",
+    "ipld-block": "^0.9.1",
     "it-length-prefixed": "^3.0.0",
     "it-pipe": "^1.1.0",
     "just-debounce-it": "^1.1.0",
diff --git a/src/types/message/index.js b/src/types/message/index.js
index fdbcbd64..0263a7ca 100644
--- a/src/types/message/index.js
+++ b/src/types/message/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Block = require('ipfs-block')
+const Block = require('ipld-block')
 const CID = require('cids')
 const { getName } = require('multicodec')
 const vd = require('varint-decoder')
diff --git a/test/decision-engine/decision-engine.js b/test/decision-engine/decision-engine.js
index fcf1cca3..eb9e5a31 100644
--- a/test/decision-engine/decision-engine.js
+++ b/test/decision-engine/decision-engine.js
@@ -8,10 +8,10 @@ const PeerId = require('peer-id')
 const range = require('lodash.range')
 const difference = require('lodash.difference')
 const flatten = require('lodash.flatten')
-const Block = require('ipfs-block')
+const Block = require('ipld-block')
 const CID = require('cids')
 const multihashing = require('multihashing-async')
-const Buffer = require('safe-buffer').Buffer
+const { Buffer } = require('buffer')
 
 const Message = require('../../src/types/message')
 const DecisionEngine = require('../../src/decision-engine')
diff --git a/test/network/gen-bitswap-network.node.js b/test/network/gen-bitswap-network.node.js
index efdbd90b..39e596d9 100644
--- a/test/network/gen-bitswap-network.node.js
+++ b/test/network/gen-bitswap-network.node.js
@@ -5,8 +5,8 @@
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
-const Block = require('ipfs-block')
-const Buffer = require('safe-buffer').Buffer
+const Block = require('ipld-block')
+const { Buffer } = require('buffer')
 const crypto = require('crypto')
 const CID = require('cids')
 const multihashing = require('multihashing-async')
diff --git a/test/notifications.spec.js b/test/notifications.spec.js
index cb538019..23a70059 100644
--- a/test/notifications.spec.js
+++ b/test/notifications.spec.js
@@ -6,7 +6,7 @@ chai.use(require('dirty-chai'))
 
 const expect = chai.expect
 const CID = require('cids')
-const Block = require('ipfs-block')
+const Block = require('ipld-block')
 
 const Notifications = require('../src/notifications')
 
diff --git a/test/types/message.spec.js b/test/types/message.spec.js
index e4af3405..139c0150 100644
--- a/test/types/message.spec.js
+++ b/test/types/message.spec.js
@@ -5,7 +5,7 @@ const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
 const CID = require('cids')
-const Buffer = require('safe-buffer').Buffer
+const { Buffer } = require('buffer')
 const loadFixture = require('aegir/fixtures')
 const testDataPath = 'test/fixtures/serialized-from-go'
 const rawMessageFullWantlist = loadFixture(testDataPath + '/bitswap110-message-full-wantlist')
diff --git a/test/utils.spec.js b/test/utils.spec.js
index 852c5dbf..e8d5aac8 100644
--- a/test/utils.spec.js
+++ b/test/utils.spec.js
@@ -2,7 +2,7 @@
 'use strict'
 const chai = require('chai')
 const CID = require('cids')
-const Block = require('ipfs-block')
+const Block = require('ipld-block')
 const { Buffer } = require('buffer')
 const multihashing = require('multihashing-async')
 const BitswapMessageEntry = require('../src/types/message/entry')
diff --git a/test/utils/make-block.js b/test/utils/make-block.js
index a071b31f..50d59713 100644
--- a/test/utils/make-block.js
+++ b/test/utils/make-block.js
@@ -2,10 +2,10 @@
 
 const multihashing = require('multihashing-async')
 const CID = require('cids')
-const Block = require('ipfs-block')
+const Block = require('ipld-block')
 const crypto = require('crypto')
 const range = require('lodash.range')
-const Buffer = require('safe-buffer').Buffer
+const { Buffer } = require('buffer')
 const uuid = require('uuid/v4')
 
 module.exports = async (count, size) => {
diff --git a/test/wantmanager/msg-queue.spec.js b/test/wantmanager/msg-queue.spec.js
index 7293a021..e68ece2c 100644
--- a/test/wantmanager/msg-queue.spec.js
+++ b/test/wantmanager/msg-queue.spec.js
@@ -7,7 +7,7 @@ const expect = chai.expect
 const PeerId = require('peer-id')
 const CID = require('cids')
 const multihashing = require('multihashing-async')
-const Buffer = require('safe-buffer').Buffer
+const { Buffer } = require('buffer')
 const Message = require('../../src/types/message')
 const MsgQueue = require('../../src/want-manager/msg-queue')