diff --git a/.github/workflows/build_and_test_eicar_rock.yaml b/.github/workflows/build_and_test_eicar_rock.yaml
index e31b414..b801def 100644
--- a/.github/workflows/build_and_test_eicar_rock.yaml
+++ b/.github/workflows/build_and_test_eicar_rock.yaml
@@ -18,7 +18,7 @@ jobs:
 
   test:
     uses: canonical/oci-factory/.github/workflows/Test-Rock.yaml@main
-    needs: [build-rock]
+    needs: [build]
     with:
       oci-archive-name: "eicar-rock"
       test-vulnerabilities: true
diff --git a/.github/workflows/build_mock_rock.yaml b/.github/workflows/build_mock_rock.yaml
index d636fcb..b3a413c 100644
--- a/.github/workflows/build_mock_rock.yaml
+++ b/.github/workflows/build_mock_rock.yaml
@@ -12,6 +12,6 @@ jobs:
     uses: canonical/oci-factory/.github/workflows/Build-Rock.yaml@main
     with:
       oci-archive-name: "mock-rock"
-      # rock-repo: canonical/rocks-toolbox
-      # rock-repo-commit: main
-      rockfile-directory: mock_rock/1.0
\ No newline at end of file
+      rock-repo: canonical/rocks-toolbox
+      rock-repo-commit: main
+      rockfile-directory: mock_rock/1.0
diff --git a/.github/workflows/test_external_rock.yaml b/.github/workflows/test_external_rock.yaml
index 1a88ec3..c7ff05d 100644
--- a/.github/workflows/test_external_rock.yaml
+++ b/.github/workflows/test_external_rock.yaml
@@ -22,21 +22,21 @@ jobs:
             -v $PWD:/workdir -w /workdir \
             ${{ env.SKOPEO_IMAGE }} \
             copy docker://${{ env.TEST_IMAGE }} \
-            oci-archive:${{ env.TEST_IMAGE_FILENAME }}
+            oci-archive:test_image
 
       - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:
-          name: ${{ env.TEST_IMAGE_FILENAME }}
-          path: ${{ env.TEST_IMAGE_FILENAME }}
+          name: test_image
+          path: test_image
           retention-days: 1
 
   test:
     uses: canonical/oci-factory/.github/workflows/Test-Rock.yaml@main
-    needs: [build-rock]
+    needs: [setup]
     with:
-      oci-archive-name: ${{ env.TEST_IMAGE_FILENAME }}
+      oci-archive-name: test_image
       test-vulnerabilities: true
       test-oci-compliance: true
       test-efficiency: true
-      test_malware: true
\ No newline at end of file
+      test_malware: true