diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 27d97ba..f4013eb 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -129,6 +129,27 @@
             bmo_release_branch: main
             capm3_target_branch: main
             ginkgo_focus: pivoting
+        - release-1-7-pivoting:
+            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: pivoting
+        - release-1-6-pivoting:
+            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: pivoting
+        - 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
         - main-remediation:
             capi_version: v1beta1
             capm3_version: v1beta1
@@ -136,6 +157,27 @@
             bmo_release_branch: main
             capm3_target_branch: main
             ginkgo_focus: remediation
+        - 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-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-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
         - main-features:
             capi_version: v1beta1
             capm3_version: v1beta1
@@ -143,20 +185,6 @@
             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
-            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
@@ -164,20 +192,6 @@
             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
-            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
@@ -185,20 +199,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
@@ -216,22 +216,6 @@
             capm3_target_branch: main
             ginkgo_focus: pivoting
             schedule: "H 19 2-30/2 * *" # Runs on even days 7 PM
-        - 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
@@ -240,22 +224,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
@@ -264,22 +232,6 @@
             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
@@ -288,6 +240,30 @@
             capm3_target_branch: release-1-5
             ginkgo_focus: pivoting
             schedule: "H 0 1-31/2 * *" # Runs on odd days 0 AM
+        - 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
+        - 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-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-5-remediation:
             capi_version: v1beta1
             capm3_version: v1beta1
@@ -296,6 +272,30 @@
             capm3_target_branch: release-1-5
             ginkgo_focus: remediation
             schedule: "H 0 1-31/2 * *" # Runs on odd days 0 AM
+        - 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-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-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-features:
             capi_version: v1beta1
             capm3_version: v1beta1