diff --git a/package-lock.json b/package-lock.json
index 52f640b..b4b5ce0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "orbit-db",
-  "version": "0.20.1",
+  "version": "0.21.0-rc.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -6602,6 +6602,18 @@
         "p-map": "^1.1.1",
         "p-whilst": "^1.0.0",
         "pify": "^4.0.1"
+      },
+      "dependencies": {
+        "orbit-db-io": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/orbit-db-io/-/orbit-db-io-0.0.1.tgz",
+          "integrity": "sha512-2zMnP9viBKRCBplBUAca6bgtRhRWgdPvJX31/1zv18PfYsYavoZpdtgJeC4qs4JLnyHnByLoqcfdP6O8qD8dRQ==",
+          "requires": {
+            "cids": "^0.5.7",
+            "ipld-dag-pb": "^0.15.2",
+            "pify": "^4.0.1"
+          }
+        }
       }
     },
     "ipfs-mfs": {
@@ -10564,10 +10576,11 @@
       "dev": true
     },
     "orbit-db-access-controllers": {
-      "version": "github:orbitdb/orbit-db-access-controllers#f25ab62e18e636477ceebd698fbe9054a9a1b329",
-      "from": "github:orbitdb/orbit-db-access-controllers#fix/add-legacy-controller",
+      "version": "0.2.0-rc.1",
+      "resolved": "https://registry.npmjs.org/orbit-db-access-controllers/-/orbit-db-access-controllers-0.2.0-rc.1.tgz",
+      "integrity": "sha512-1JIdPQXLKDleQ4uBDu6apTmGmS9T18SdlpD9reHW+Ei+/q8NHgaQlKiLxBCf2uh+2ZPQlMDo90YaV+4OXMc7dw==",
       "requires": {
-        "orbit-db-io": "github:orbitdb/orbit-db-io#0eba55ef9817ab4eb94af3149c03b4bb37a662ec",
+        "orbit-db-io": "^0.0.2-rc.1",
         "p-map-series": "^1.0.0"
       }
     },
@@ -10633,8 +10646,9 @@
       }
     },
     "orbit-db-io": {
-      "version": "github:orbitdb/orbit-db-io#0eba55ef9817ab4eb94af3149c03b4bb37a662ec",
-      "from": "github:orbitdb/orbit-db-io#feat/pass-format",
+      "version": "0.0.2-rc.1",
+      "resolved": "https://registry.npmjs.org/orbit-db-io/-/orbit-db-io-0.0.2-rc.1.tgz",
+      "integrity": "sha512-cMmU9BRue2vy3SO6ADdVf3MARhuUSRNlhqFJD/xvroonC1WON1ui7BJFynnU4GhwBXcR5C9jgAQ34rljomdx7A==",
       "requires": {
         "cids": "^0.5.7",
         "ipld-dag-pb": "^0.15.2",
@@ -10748,6 +10762,18 @@
         "orbit-db-io": "~0.0.1",
         "p-each-series": "^1.0.0",
         "readable-stream": "~2.3.5"
+      },
+      "dependencies": {
+        "orbit-db-io": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/orbit-db-io/-/orbit-db-io-0.0.1.tgz",
+          "integrity": "sha512-2zMnP9viBKRCBplBUAca6bgtRhRWgdPvJX31/1zv18PfYsYavoZpdtgJeC4qs4JLnyHnByLoqcfdP6O8qD8dRQ==",
+          "requires": {
+            "cids": "^0.5.7",
+            "ipld-dag-pb": "^0.15.2",
+            "pify": "^4.0.1"
+          }
+        }
       }
     },
     "os-browserify": {
@@ -14961,9 +14987,9 @@
           }
         },
         "chokidar": {
-          "version": "2.1.5",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
-          "integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
+          "version": "2.1.6",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
+          "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
           "dev": true,
           "requires": {
             "anymatch": "^2.0.0",
diff --git a/package.json b/package.json
index 2c71658..7a30d1a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "orbit-db",
-  "version": "0.20.1",
+  "version": "0.21.0-rc.1",
   "description": "Distributed p2p database on IPFS",
   "author": "Haad",
   "license": "MIT",
@@ -18,14 +18,14 @@
     "localstorage-down": "^0.6.7",
     "logplease": "^1.2.14",
     "multihashes": "^0.4.12",
-    "orbit-db-access-controllers": "github:orbitdb/orbit-db-access-controllers#fix/add-legacy-controller",
+    "orbit-db-access-controllers": "next",
     "orbit-db-cache": "~0.2.4",
     "orbit-db-counterstore": "~1.5.0",
     "orbit-db-docstore": "~1.5.0",
     "orbit-db-eventstore": "~1.5.0",
     "orbit-db-feedstore": "~1.5.0",
     "orbit-db-identity-provider": "~0.1.0",
-    "orbit-db-io": "github:orbitdb/orbit-db-io#feat/pass-format",
+    "orbit-db-io": "next",
     "orbit-db-keystore": "^0.2.1",
     "orbit-db-kvstore": "~1.5.0",
     "orbit-db-pubsub": "~0.5.5",