diff --git a/.github/workflows/loading-gs64-components.yml b/.github/workflows/loading-gs64-components.yml
index 8840414..c86ca12 100644
--- a/.github/workflows/loading-gs64-components.yml
+++ b/.github/workflows/loading-gs64-components.yml
@@ -5,22 +5,35 @@ on:
   - workflow_dispatch
 
 jobs:
-   component-loading:
+   component-loading-3.7.0:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        gs64-ci:
-          - ba-st-actions/gs64-ci@v2 #GS64 3.7.0
-          - ba-st-actions/gs64-ci@v3 #GS64 3.7.1
         load-spec:
           - Dependent-SUnit-Extensions
           - Deployment
-    name: GS64 + ${{ matrix.load-spec }}
+    name: GS64 v3.7.0 + ${{ matrix.load-spec }}
     steps:
       - uses: actions/checkout@v4
       - name: Load component in image
-        uses: ${{ matrix.gs64-ci }}
+        uses: ba-st-actions/gs64-ci@v2
+        with:
+          project_name: 'Buoy'
+          load_spec: 'Buoy-${{ matrix.load-spec }}'
+   component-loading-3.7.1:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        load-spec:
+          - Dependent-SUnit-Extensions
+          - Deployment
+    name: GS64 v3.7.1 + ${{ matrix.load-spec }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Load component in image
+        uses: ba-st-actions/gs64-ci@v3
         with:
           project_name: 'Buoy'
           load_spec: 'Buoy-${{ matrix.load-spec }}'
diff --git a/.github/workflows/unit-tests-gs64.yml b/.github/workflows/unit-tests-gs64.yml
index 883a11c..1e59527 100644
--- a/.github/workflows/unit-tests-gs64.yml
+++ b/.github/workflows/unit-tests-gs64.yml
@@ -5,19 +5,23 @@ on:
   - workflow_dispatch
 
 jobs:
-  unit-tests:
+  unit-tests-3.7.0:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        gs64-ci:
-          - v2 #GS64 3.7.0
-          - v3 #GS64 3.7.1
-    name: GS64 Unit Tests
+    name: GS64 3.7.0 Unit Tests
     steps:
       - uses: actions/checkout@v4
       - name: Load Image and Run Tests
-        uses: 'ba-st-actions/gs64-ci@${{ matrix.gs64-ci }}'
+        uses: 'ba-st-actions/gs64-ci@v2
+        with:
+          project_name: 'Buoy'
+          run_tests: 'true'
+  unit-tests-3.7.1:
+    runs-on: ubuntu-latest
+    name: GS64 3.7.1 Unit Tests
+    steps:
+      - uses: actions/checkout@v4
+      - name: Load Image and Run Tests
+        uses: 'ba-st-actions/gs64-ci@v3
         with:
           project_name: 'Buoy'
           run_tests: 'true'