diff --git a/.github/workflows/test-mixed-versions.yaml b/.github/workflows/test-mixed-versions.yaml
index 294cf937745f..4b03199c0cdf 100644
--- a/.github/workflows/test-mixed-versions.yaml
+++ b/.github/workflows/test-mixed-versions.yaml
@@ -3,11 +3,8 @@ on:
   push:
     branches:
     - main
-    - v3.12.x
-    - v3.11.x
-    - v3.10.x
-    - v3.9.x
-    - v3.8.x
+    - v4.0.x
+    - v3.13.x
     - bump-otp-*
     - bump-elixir-*
     - bump-rbe-*
@@ -632,7 +629,7 @@ jobs:
     - test-rabbit-9-mixed
     uses: ./.github/workflows/test-plugin-mixed.yaml
     with:
-      repo_cache_key: $*** needs.check-workflow.outputs.repo_cache_key ***
+      repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
       plugin: rabbitmq_federation_prometheus
     secrets: inherit
   test-rabbitmq_jms_topic_exchange-mixed:
@@ -936,11 +933,11 @@ jobs:
     - test-rabbit-7-mixed
     - test-rabbit-8-mixed
     - test-rabbit-9-mixed
-+    uses: ./.github/workflows/test-plugin-mixed.yaml
-+    with:
-+      repo_cache_key: $*** needs.check-workflow.outputs.repo_cache_key ***
-+      plugin: rabbitmq_shovel_prometheus
-+    secrets: inherit
+    uses: ./.github/workflows/test-plugin-mixed.yaml
+    with:
+      repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
+      plugin: rabbitmq_shovel_prometheus
+    secrets: inherit
   test-rabbitmq_stomp-mixed:
     needs:
     - check-workflow
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index cfabad2feecc..c1a8dfa57b78 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -554,7 +554,7 @@ jobs:
       repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
       plugin: rabbitmq_federation_management
     secrets: inherit
-  test-rabbitmq_shovel_prometheus:
+  test-rabbitmq_federation_prometheus:
     needs:
     - check-workflow
     - test-rabbit-0
@@ -569,8 +569,8 @@ jobs:
     - test-rabbit-9
     uses: ./.github/workflows/test-plugin.yaml
     with:
-      repo_cache_key: $*** needs.check-workflow.outputs.repo_cache_key ***
-      plugin: rabbitmq_shovel_prometheus
+      repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
+      plugin: rabbitmq_federation_prometheus
     secrets: inherit
   test-rabbitmq_jms_topic_exchange:
     needs:
@@ -875,7 +875,7 @@ jobs:
     - test-rabbit-9
     uses: ./.github/workflows/test-plugin.yaml
     with:
-      repo_cache_key: $*** needs.check-workflow.outputs.repo_cache_key ***
+      repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
       plugin: rabbitmq_shovel_prometheus
     secrets: inherit
   test-rabbitmq_stomp: