diff --git a/.github/workflows/motoko-updater.yml b/.github/workflows/motoko-updater.yml
index 9cfd97472e..8cf95d3c8b 100644
--- a/.github/workflows/motoko-updater.yml
+++ b/.github/workflows/motoko-updater.yml
@@ -20,8 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: niv-updater-action
-        # Use our fork until https://github.com/knl/niv-updater-action/pull/46 is merged
-        uses: dfinity-lab/niv-updater-action@46d903454cded66eb06b1d17aeb2ddae403fc553
+        uses: knl/niv-updater-action@60f23607814cf4f2e80a1e32ee74f8323897d09e
         with:
           whitelist: 'motoko'
           title_prefix: 'build: '
diff --git a/.github/workflows/niv-updater.yml b/.github/workflows/niv-updater.yml
index f4a2c3dad9..5e08018ddd 100644
--- a/.github/workflows/niv-updater.yml
+++ b/.github/workflows/niv-updater.yml
@@ -19,8 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: niv-updater-action
-        # Use our fork until https://github.com/knl/niv-updater-action/pull/46 is merged
-        uses: dfinity-lab/niv-updater-action@46d903454cded66eb06b1d17aeb2ddae403fc553
+        uses: knl/niv-updater-action@60f23607814cf4f2e80a1e32ee74f8323897d09e
         with:
           whitelist: 'common,advisory-db,napalm'
           title_prefix: 'build: '
diff --git a/nix/sources.json b/nix/sources.json
index 53d7cbc37d..d128e2c126 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -50,9 +50,10 @@
         "type": "git"
     },
     "motoko": {
-        "repo": "ssh://git@github.com/dfinity/motoko",
-        "rev": "9b07f5c1a41fe2cb2205255ed0819ca54278ba2a",
-        "tag": "0.6.1",
+        "branch": "release",
+        "repo": "https://github.com/dfinity/motoko",
+        "rev": "bd98d37ad43ff625c2053607c0c0565f339fa0b0",
+        "tag": "0.6.5",
         "type": "git"
     },
     "napalm": {