diff --git a/.github/workflows/niv-updater-rare.yml b/.github/workflows/niv-updater-rare.yml
index 2dda9871a55..dc1d21caedc 100644
--- a/.github/workflows/niv-updater-rare.yml
+++ b/.github/workflows/niv-updater-rare.yml
@@ -16,10 +16,12 @@ on:
 jobs:
   niv-updater:
     name: 'Check for updates'
+    timeout-minutes: 2 # if this takes more than 2 minutes then something's wrong
     runs-on: ubuntu-latest
     steps:
       - name: niv-updater-action
-        uses: knl/niv-updater-action@dbe84dffd27c7b5079dd748ce61a3e9797a68cf8
+        # Use our fork until https://github.com/knl/niv-updater-action/pull/46 is merged
+        uses: dfinity-lab/niv-updater-action@46d903454cded66eb06b1d17aeb2ddae403fc553
         with:
           # might be too noisy
           whitelist: 'dfinity,ic-ref,musl-wasi,common,niv'
diff --git a/.github/workflows/niv-updater-trial.yml b/.github/workflows/niv-updater-trial.yml
index 1777b9052a5..479eeced158 100644
--- a/.github/workflows/niv-updater-trial.yml
+++ b/.github/workflows/niv-updater-trial.yml
@@ -22,10 +22,12 @@ on:
 jobs:
   niv-updater:
     name: 'Check for updates'
+    timeout-minutes: 2 # if this takes more than 2 minutes then something's wrong
     runs-on: ubuntu-latest
     steps:
       - name: niv-updater-action
-        uses: knl/niv-updater-action@dbe84dffd27c7b5079dd748ce61a3e9797a68cf8
+        # Use our fork until https://github.com/knl/niv-updater-action/pull/46 is merged
+        uses: dfinity-lab/niv-updater-action@46d903454cded66eb06b1d17aeb2ddae403fc553
         with:
           whitelist: 'nixpkgs,musl-wasi'
           labels: |
diff --git a/.github/workflows/niv-updater.yml b/.github/workflows/niv-updater.yml
index 5e10d3dc627..b43490170c5 100644
--- a/.github/workflows/niv-updater.yml
+++ b/.github/workflows/niv-updater.yml
@@ -16,10 +16,12 @@ on:
 jobs:
   niv-updater:
     name: 'Check for updates'
+    timeout-minutes: 2 # if this takes more than 2 minutes then something's wrong
     runs-on: ubuntu-latest
     steps:
       - name: niv-updater-action
-        uses: knl/niv-updater-action@dbe84dffd27c7b5079dd748ce61a3e9797a68cf8
+        # Use our fork until https://github.com/knl/niv-updater-action/pull/46 is merged
+        uses: dfinity-lab/niv-updater-action@46d903454cded66eb06b1d17aeb2ddae403fc553
         with:
           # might be too noisy
           blacklist: 'nixpkgs,dfinity,ic-ref,musl-wasi,common,niv,wasm-profiler'