diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2c1106fca03..c9e22150e37 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,16 +23,16 @@ jobs:
         run: |
           git clone --branch v1.5.4 --depth 1 https://github.com/jasongin/nvs.git ~/.nvs
           cd ~/.nvs
-          . ./nvs.sh || { git clean -xdf && . ./nvs.sh; } || { git clean -xdf && . ./nvs.sh; }
+          chmod a+x ./nvs.sh
+          while !(./nvs.sh --version); do git clean -xdf; done;
+          while !(./nvs.sh add $NODE); do echo "'nvs add $NODE' failed - retrying..."; done;
+          ./nvs.sh use $NODE
           cd -
-          nvs --version
-          nvs add $NODE || nvs add $NODE || nvs add $NODE
-          nvs use $NODE
           node --version
           npm config set audit false
           npm config set optional false
           npm config set save false
           npm config set update-notifier false
           npm --version
-          npm install || npm install || npm install
+          while !(npm install); do echo "'npm install' failed - retrying..."; done;
           node test/$TYPE
diff --git a/.github/workflows/ufuzz.yml b/.github/workflows/ufuzz.yml
index 4b200b375bc..be20849ef9a 100644
--- a/.github/workflows/ufuzz.yml
+++ b/.github/workflows/ufuzz.yml
@@ -17,16 +17,16 @@ jobs:
         run: |
           git clone --branch v1.5.4 --depth 1 https://github.com/jasongin/nvs.git ~/.nvs
           cd ~/.nvs
-          . ./nvs.sh || { git clean -xdf && . ./nvs.sh; } || { git clean -xdf && . ./nvs.sh; }
+          chmod a+x ./nvs.sh
+          while !(./nvs.sh --version); do git clean -xdf; done;
+          while !(./nvs.sh add 10); do echo "'nvs add 10' failed - retrying..."; done;
+          ./nvs.sh use 10
           cd -
-          nvs --version
-          nvs add 10 || nvs add 10 || nvs add 10
-          nvs use 10
           node --version
           npm config set audit false
           npm config set optional false
           npm config set save false
           npm config set update-notifier false
           npm --version
-          npm install || npm install || npm install
+          while !(npm install); do echo "'npm install' failed - retrying..."; done;
           node test/ufuzz/job 3600000