diff --git a/.github/workflows/common_library_tests.yaml b/.github/workflows/common_library_tests.yaml
index 68ca8be7..3c6690c6 100644
--- a/.github/workflows/common_library_tests.yaml
+++ b/.github/workflows/common_library_tests.yaml
@@ -145,43 +145,16 @@ jobs:
       - name: Set up chart-testing
         uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
 
-      - name: Create k3d cluster - Attempt 1/3
-        continue-on-error: true
-        id: clusterc1
-        uses: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96 # tag=v1.0.9
+      - name: Create k3d cluster (With retry on failure)
+        uses: Wandalen/wretry.action@e6cf3db7de3777ba5f999f903c2f4efdd9ac7288
         with:
-          version: ${{ matrix.k3s-version }}
-          # Flags found here https://github.com/k3d-io/k3d
-          k3d-args: --k3s-arg --disable=metrics-server@server:*
-
-      - name: Wait 10 second to retry
-        if: steps.clusterc1.outcome=='failure'
-        run: |
-          sleep 10
-
-      - name: Create k3d cluster - Attempt 2/3
-        continue-on-error: true
-        if: steps.clusterc1.outcome=='failure'
-        id: clusterc2
-        uses: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96 # tag=v1.0.9
-        with:
-          version: ${{ matrix.k3s-version }}
-          # Flags found here https://github.com/k3d-io/k3d
-          k3d-args: --k3s-arg --disable=metrics-server@server:*
-
-      - name: Wait 10 second to retry
-        if: steps.clusterc2.outcome=='failure'
-        run: |
-          sleep 10
-
-      - name: Create k3d cluster - Attempt 2/3
-        if: steps.clusterc2.outcome=='failure'
-        id: clusterc3
-        uses: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96 # tag=v1.0.9
-        with:
-          version: ${{ matrix.k3s-version }}
-          # Flags found here https://github.com/k3d-io/k3d
-          k3d-args: --k3s-arg --disable=metrics-server@server:*
+          attempt_limit: 5
+          attempt_delay: 5000 # milliseconds
+          action: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96 # tag=v1.0.9
+          with: |
+            version: ${{ matrix.k3s-version }}
+            # Flags found here https://github.com/k3d-io/k3d
+            k3d-args: --k3s-arg --disable=metrics-server@server:*
 
         # Move CI Values to a temp location
       - name: Move CI values