diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index b750a80..acc8267 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -123,53 +123,189 @@
             bmo_release_branch: release-0.5
             schedule: "30 1 * * *"
     - capm3_e2e_feature_tests_prow:
-        capm3_target_branch:
-        - main:
+        capm3_target_job:
+        - main-pivoting:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-        - release-1-7:
+            capm3_target_branch: main
+            ginkgo_focus: pivoting
+        - main-remediation:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: main
+            bmo_release_branch: main
+            capm3_target_branch: main
+            ginkgo_focus: remediation
+        - main-features:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: main
+            bmo_release_branch: main
+            capm3_target_branch: main
+            ginkgo_focus: features
+        - release-1-7-pivoting:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.7
             bmo_release_branch: release-0.6
-        - release-1-6:
+            capm3_target_branch: release-1-7
+            ginkgo_focus: pivoting
+        - release-1-7-remediation:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            capm3_target_branch: release-1-7
+            ginkgo_focus: remediation
+        - release-1-7-features:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            capm3_target_branch: release-1-7
+            ginkgo_focus: features
+        - release-1-6-pivoting:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-        - release-1-5:
+            capm3_target_branch: release-1-6
+            ginkgo_focus: pivoting
+        - release-1-6-remediation:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.6
+            bmo_release_branch: release-0.5
+            capm3_target_branch: release-1-6
+            ginkgo_focus: remediation
+        - release-1-6-features:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.6
+            bmo_release_branch: release-0.5
+            capm3_target_branch: release-1-6
+            ginkgo_focus: features
+        - release-1-5-pivoting:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
+            capm3_target_branch: release-1-5
+            ginkgo_focus: pivoting
+        - release-1-5-remediation:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.5
+            bmo_release_branch: release-0.4
+            capm3_target_branch: release-1-5
+            ginkgo_focus: remediation
+        - release-1-5-features:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.5
+            bmo_release_branch: release-0.4
+            capm3_target_branch: release-1-5
+            ginkgo_focus: features
     - capm3_periodic_e2e_feature_tests_prow:
-        capm3_target_branch:
-        - main:
+        capm3_target_job:
+        - main-pivoting:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
+            capm3_target_branch: main
+            ginkgo_focus: pivoting
             schedule: "H 19 2-30/2 * *" # Runs on even days 7 PM
-        - release-1-7:
+        - main-remediation:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: main
+            bmo_release_branch: main
+            capm3_target_branch: main
+            ginkgo_focus: remediation
+            schedule: "H 19 2-30/2 * *" # Runs on even days 7 PM
+        - main-features:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: main
+            bmo_release_branch: main
+            capm3_target_branch: main
+            ginkgo_focus: features
+            schedule: "H 19 2-30/2 * *" # Runs on even days 7 PM
+        - release-1-7-pivoting:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.7
             bmo_release_branch: release-0.6
-            schedule: "H 0 2-30/2 * *" # Runs on even days 0 AM
-        - release-1-6:
+            capm3_target_branch: release-1-7
+            ginkgo_focus: pivoting
+            schedule: "H 19 1-31/2 * *" # Runs on odd days 7 PM
+        - release-1-7-remediation:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            capm3_target_branch: release-1-7
+            ginkgo_focus: remediation
+            schedule: "H 19 1-31/2 * *" # Runs on odd days 7 PM
+        - release-1-7-features:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            capm3_target_branch: release-1-7
+            ginkgo_focus: features
+            schedule: "H 19 1-31/2 * *" # Runs on odd days 7 PM
+        - release-1-6-pivoting:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-            schedule: "H 5 2-30/2 * *" # Runs on even days 5 AM
-        - release-1-5:
+            capm3_target_branch: release-1-6
+            ginkgo_focus: pivoting
+            schedule: "H 0 2-30/2 * *" # Runs on even days 0 AM
+        - release-1-6-remediation:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.6
+            bmo_release_branch: release-0.5
+            capm3_target_branch: release-1-6
+            ginkgo_focus: remediation
+            schedule: "H 0 2-30/2 * *" # Runs on even days 0 AM
+        - release-1-6-features:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.6
+            bmo_release_branch: release-0.5
+            capm3_target_branch: release-1-6
+            ginkgo_focus: features
+            schedule: "H 0 2-30/2 * *" # Runs on even days 0 AM
+        - release-1-5-pivoting:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-            schedule: "H 10 2-30/2 * *" # Runs on even days 10 AM
+            capm3_target_branch: release-1-5
+            ginkgo_focus: pivoting
+            schedule: "H 0 1-31/2 * *" # Runs on odd days 0 AM
+        - release-1-5-remediation:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.5
+            bmo_release_branch: release-0.4
+            capm3_target_branch: release-1-5
+            ginkgo_focus: remediation
+            schedule: "H 0 1-31/2 * *" # Runs on odd days 0 AM
+        - release-1-5-features:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.5
+            bmo_release_branch: release-0.4
+            capm3_target_branch: release-1-5
+            ginkgo_focus: features
+            schedule: "H 0 1-31/2 * *" # Runs on odd days 0 AM
         exclude:
         - image_os: ubuntu # This is to disable the tests running on ubuntu, to save resources
     - capm3_e2e_clusterctl_upgrade_tests_prow: