diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index f326917..d19e467 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -804,16 +804,103 @@
             target_branches:
             - 'release-1.4'
             - 'release-0.3'
-- project:
-    name: "capm3-main-tests"
-    repo:
-      org: "metal3-io"
-      name: "cluster-api-provider-metal3"
-    image_os:
-    - ubuntu
-    - centos
-    jobs:
-    - capm3_main_e2e_clusterctl_upgrade_tests:
+    - capm3_clusterctl_upgrade_tests_prow:
+        capm3_target_branch:
+        - main:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: main
+            bmo_release_branch: main
+            target_branches:
+            - 'main'
+        - release-1-6:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.6
+            bmo_release_branch: release-0.5
+            target_branches:
+            - 'release-1.6'
+            - 'release-0.5'
+        - release-1-5:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.5
+            bmo_release_branch: release-0.4
+            target_branches:
+            - 'release-1.5'
+            - 'release-0.4'
+        - release-1-4:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.4
+            bmo_release_branch: release-0.3
+            target_branches:
+            - 'release-1.4'
+            - 'release-0.3'
+        exclude:
+        - image_os: centos
+    - capm3_e2e_k8s_upgrade_tests_prow:
+        k8s_versions:
+        - 1-28-1-29:
+            k8s_version_upgrade_from: v1.28.1
+            k8s_version_upgrade_to: v1.29.0
+            kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
+            capm3_release_branch: main
+            bmo_release_branch: main
+            capm3_target_branch: main
+            target_branches:
+            - 'main'
+        - 1-27-1-28:
+            k8s_version_upgrade_from: v1.27.4
+            k8s_version_upgrade_to: v1.28.1
+            kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 # v1.28.1
+            capm3_release_branch: main
+            bmo_release_branch: main
+            capm3_target_branch: main
+            target_branches:
+            - 'main'
+        - 1-26-1-27:
+            k8s_version_upgrade_from: v1.26.4
+            k8s_version_upgrade_to: v1.27.4
+            kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
+            capm3_release_branch: main
+            capm3_target_branch: main
+            bmo_release_branch: main
+            target_branches:
+            - 'main'
+        - 1-28-1-29:
+            k8s_version_upgrade_from: v1.28.1
+            k8s_version_upgrade_to: v1.29.0
+            kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
+            capm3_release_branch: release-1.6
+            bmo_release_branch: release-0.5
+            capm3_target_branch: release-1-6
+            target_branches:
+            - 'release-1.6'
+            - 'release-0.5'
+        - 1-26-1-27:
+            k8s_version_upgrade_from: v1.26.4
+            k8s_version_upgrade_to: v1.27.4
+            kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
+            capm3_release_branch: release-1.5
+            bmo_release_branch: release-0.4
+            capm3_target_branch: release-1-5
+            target_branches:
+            - 'release-1.5'
+            - 'release-0.4'
+        - 1-26-1-27:
+            k8s_version_upgrade_from: v1.26.4
+            kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
+            k8s_version_upgrade_to: v1.27.4
+            capm3_release_branch: release-1.4
+            bmo_release_branch: release-0.3
+            capm3_target_branch: release-1-4
+            target_branches:
+            - 'release-1.4'
+            - 'release-0.3'
+        exclude:
+        - image_os: centos
+    - capm3_main_e2e_clusterctl_upgrade_tests_prow:
         upgrade_from_release:
         - from-release-1-6:
             upgrade_from: v1.6.
@@ -827,7 +914,7 @@
             upgrade_from: v0.5.
         exclude:
         - image_os: centos
-    - capm3_main_e2e_k8s_upgrade_tests:
+    - capm3_main_e2e_k8s_upgrade_tests_prow:
         k8s_versions:
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
@@ -877,6 +964,91 @@
             capm3_target_branch: release-1-4
         exclude:
         - image_os: centos
+    - keep_capm3_e2e_clusterctl_upgrade_tests_prow:
+        upgrade_from_release:
+        - from-release-1-6:
+            upgrade_from: v1.6.
+        - from-release-1-5:
+            upgrade_from: v1.5.
+        - from-release-1-4:
+            upgrade_from: v1.4.
+        - from-release-1-3:
+            upgrade_from: v1.3.
+        - from-release-0-5:
+            upgrade_from: v0.5.
+        exclude:
+        - image_os: centos
+    - keep_capm3_e2e_k8s_upgrade_tests_prow:
+        k8s_versions:
+        - 1-28-1-29:
+            k8s_version_upgrade_from: v1.28.1
+            k8s_version_upgrade_to: v1.29.0
+            kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
+            capm3_release_branch: main
+            bmo_release_branch: main
+            capm3_target_branch: main
+            target_branches:
+            - 'main'
+        - 1-27-1-28:
+            k8s_version_upgrade_from: v1.27.4
+            k8s_version_upgrade_to: v1.28.1
+            kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 # v1.28.1
+            capm3_release_branch: main
+            bmo_release_branch: main
+            capm3_target_branch: main
+            target_branches:
+            - 'main'
+        - 1-26-1-27:
+            k8s_version_upgrade_from: v1.26.4
+            k8s_version_upgrade_to: v1.27.4
+            kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
+            capm3_release_branch: main
+            bmo_release_branch: main
+            capm3_target_branch: main
+            target_branches:
+            - 'main'
+        - 1-28-1-29:
+            k8s_version_upgrade_from: v1.28.1
+            k8s_version_upgrade_to: v1.29.0
+            kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
+            capm3_release_branch: release-1.6
+            bmo_release_branch: release-0.5
+            capm3_target_branch: release-1-6
+            target_branches:
+            - 'release-1.6'
+            - 'release-0.5'
+        - 1-26-1-27:
+            k8s_version_upgrade_from: v1.26.4
+            k8s_version_upgrade_to: v1.27.4
+            kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
+            capm3_release_branch: release-1.5
+            bmo_release_branch: release-0.4
+            capm3_target_branch: release-1-5
+            target_branches:
+            - 'release-1.5'
+            - 'release-0.4'
+        - 1-26-1-27:
+            k8s_version_upgrade_from: v1.26.4
+            kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
+            k8s_version_upgrade_to: v1.27.4
+            capm3_release_branch: release-1.4
+            bmo_release_branch: release-0.3
+            capm3_target_branch: release-1-4
+            target_branches:
+            - 'release-1.4'
+            - 'release-0.3'
+        exclude:
+        - image_os: centos
+
+- project:
+    name: "capm3-main-tests"
+    repo:
+      org: "metal3-io"
+      name: "cluster-api-provider-metal3"
+    image_os:
+    - ubuntu
+    - centos
+    jobs:
     - capm3_main_e2e_ephemeral_tests:
         exclude:
         - image_os: ubuntu