diff --git a/.github/workflows/test-add-compiler-matrix.yml b/.github/workflows/test-add-compiler-matrix.yml
index 213124a5..a9622702 100644
--- a/.github/workflows/test-add-compiler-matrix.yml
+++ b/.github/workflows/test-add-compiler-matrix.yml
@@ -55,28 +55,32 @@ jobs:
             bundle env
           echo ::endgroup::
       - name: Provision test cluster
-        timeout-minutes: 15
-        run: |
-          echo ::group::prepare
-            mkdir -p $HOME/.ssh
-            echo 'Host *'                      >  $HOME/.ssh/config
-            echo '    ServerAliveInterval 150' >> $HOME/.ssh/config
-            echo '    ServerAliveCountMax 2'   >> $HOME/.ssh/config
-            bundle exec rake spec_prep
-          echo ::endgroup::
-          echo ::group::provision
-            bundle exec bolt plan run peadm_spec::provision_test_cluster \
-              --modulepath spec/fixtures/modules \
-              provider=provision_service \
-              image=${{ matrix.image }} \
-              architecture=${{ matrix.architecture }}-with-extra-compiler
-          echo ::endgroup::
-          echo ::group::info:request
-            cat request.json || true; echo
-          echo ::endgroup::
-          echo ::group::info:inventory
-            sed -e 's/password: .*/password: "[redacted]"/' < spec/fixtures/litmus_inventory.yaml || true
-          echo ::endgroup::
+        uses: nick-fields/retry@v3
+        with:
+          max_attempts: 3
+          retry_wait_seconds: 40
+          timeout_minutes: 15
+          command: |
+            echo ::group::prepare
+              mkdir -p $HOME/.ssh
+              echo 'Host *'                      >  $HOME/.ssh/config
+              echo '    ServerAliveInterval 150' >> $HOME/.ssh/config
+              echo '    ServerAliveCountMax 2'   >> $HOME/.ssh/config
+              bundle exec rake spec_prep
+            echo ::endgroup::
+            echo ::group::provision
+              bundle exec bolt plan run peadm_spec::provision_test_cluster \
+                --modulepath spec/fixtures/modules \
+                provider=provision_service \
+                image=${{ matrix.image }} \
+                architecture=${{ matrix.architecture }}-with-extra-compiler
+            echo ::endgroup::
+            echo ::group::info:request
+              cat request.json || true; echo
+            echo ::endgroup::
+            echo ::group::info:inventory
+              sed -e 's/password: .*/password: "[redacted]"/' < spec/fixtures/litmus_inventory.yaml || true
+            echo ::endgroup::
       - name: Install PE on test cluster
         timeout-minutes: 120
         run: |
diff --git a/.github/workflows/test-migration.yaml b/.github/workflows/test-migration.yaml
index 48d6bc8e..b2cdc1e6 100644
--- a/.github/workflows/test-migration.yaml
+++ b/.github/workflows/test-migration.yaml
@@ -85,36 +85,40 @@ jobs:
             bundle env
           echo ::endgroup::
       - name: Provision test cluster
-        timeout-minutes: 15
-        run: |
-          echo ::group::prepare
-            mkdir -p $HOME/.ssh
-            echo 'Host *'                      >  $HOME/.ssh/config
-            echo '    ServerAliveInterval 150' >> $HOME/.ssh/config
-            echo '    ServerAliveCountMax 2'   >> $HOME/.ssh/config
-            bundle exec rake spec_prep
-          echo ::endgroup::
-          echo ::group::provision
-            bundle exec bolt plan run peadm_spec::provision_test_cluster \
+        uses: nick-fields/retry@v3
+        with:
+          max_attempts: 3
+          retry_wait_seconds: 40
+          timeout_minutes: 15
+          command: |
+            echo ::group::prepare
+              mkdir -p $HOME/.ssh
+              echo 'Host *'                      >  $HOME/.ssh/config
+              echo '    ServerAliveInterval 150' >> $HOME/.ssh/config
+              echo '    ServerAliveCountMax 2'   >> $HOME/.ssh/config
+              bundle exec rake spec_prep
+            echo ::endgroup::
+            echo ::group::provision
+              bundle exec bolt plan run peadm_spec::provision_test_cluster \
+                --modulepath spec/fixtures/modules \
+                provider=provision_service \
+                image=${{ matrix.image }} \
+                architecture=${{ matrix.architecture }}-migration \
+                --log-level trace
+            echo ::endgroup::
+            echo ::group::info:request
+              cat request.json || true; echo
+            echo ::endgroup::
+            echo ::group::info:inventory
+              sed -e 's/password: .*/password: "[redacted]"/' < spec/fixtures/litmus_inventory.yaml || true
+            echo ::endgroup::
+            echo ::group::certnames
+              bundle exec bolt plan run peadm_spec::add_inventory_hostnames \
+              --inventory spec/fixtures/litmus_inventory.yaml \
               --modulepath spec/fixtures/modules \
-              provider=provision_service \
-              image=${{ matrix.image }} \
-              architecture=${{ matrix.architecture }}-migration \
-              --log-level trace
-          echo ::endgroup::
-          echo ::group::info:request
-            cat request.json || true; echo
-          echo ::endgroup::
-          echo ::group::info:inventory
-            sed -e 's/password: .*/password: "[redacted]"/' < spec/fixtures/litmus_inventory.yaml || true
-          echo ::endgroup::
-          echo ::group::certnames
-            bundle exec bolt plan run peadm_spec::add_inventory_hostnames \
-            --inventory spec/fixtures/litmus_inventory.yaml \
-            --modulepath spec/fixtures/modules \
-            --no-host-key-check \
-            inventory_file=spec/fixtures/litmus_inventory.yaml
-          echo ::endgroup::            
+              --no-host-key-check \
+              inventory_file=spec/fixtures/litmus_inventory.yaml
+            echo ::endgroup::            
       - name: Output contents of litmus_inventory.yaml
         run: |
           cat spec/fixtures/litmus_inventory.yaml