diff --git a/jjb/metal3/job_capm3_e2e_tests.yml b/jjb/metal3/job_capm3_e2e_tests.yml
index d5eb963..bcc5542 100644
--- a/jjb/metal3/job_capm3_e2e_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_tests.yml
@@ -26,8 +26,8 @@
 
 - job-template:
     id: capm3_e2e_tests
-    name: '{job_prefix}_{name}_{version}_e2e_test_{image_os}'
-    description: "CAPM3 {capm3_version} e2e tests for {repo[org]}/{repo[name]} on {image_os}."
+    name: '{job_prefix}_{proj}_{version}_e2e_test_{image_os}'
+    description: "CAPM3 {capm3_version} e2e tests for {org}/{repo} on {image_os}."
     project-type: pipeline
     defaults: global
     disabled: False
@@ -35,11 +35,11 @@
     parameters:
     - string:
         name: PROJECT_REPO_ORG
-        default: '{repo[org]}'
+        default: '{org}'
         description: 'Project github repo org name'
     - string:
         name: PROJECT_REPO_NAME
-        default: '{repo[name]}'
+        default: '{repo}'
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
@@ -47,7 +47,7 @@
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
-        default: 'https://github.com/{repo[org]}/{repo[name]}.git'
+        default: 'https://github.com/{org}/{repo}.git'
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
@@ -81,7 +81,7 @@
         artifact-days-to-keep: -1
         artifact-num-to-keep: -1
     - github:
-        url: https://github.com/{repo[org]}/{repo[name]}
+        url: https://github.com/{org}/{repo}
 
     triggers:
     - github-pull-request:
diff --git a/jjb/metal3/job_capm3_e2e_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
index 2014a47..188dd07 100644
--- a/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
@@ -26,8 +26,8 @@
 
 - job-template:
     id: capm3_e2e_upgrade_tests
-    name: '{job_prefix}_{name}_v1b1_e2e_upgrade_test_{image_os}'
-    description: "CAPM3 e2e upgrade tests for {repo[org]}/{repo[name]} on {image_os}."
+    name: '{job_prefix}_{proj}_v1b1_e2e_upgrade_test_{image_os}'
+    description: "CAPM3 e2e upgrade tests for {org}/{repo} on {image_os}."
     project-type: pipeline
     defaults: global
     disabled: False
@@ -35,11 +35,11 @@
     parameters:
     - string:
         name: PROJECT_REPO_ORG
-        default: '{repo[org]}'
+        default: '{org}'
         description: 'Project github repo org name'
     - string:
         name: PROJECT_REPO_NAME
-        default: '{repo[name]}'
+        default: '{repo}'
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
@@ -47,7 +47,7 @@
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
-        default: 'https://github.com/{repo[org]}/{repo[name]}.git'
+        default: 'https://github.com/{org}/{repo}.git'
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
@@ -85,7 +85,7 @@
         artifact-days-to-keep: -1
         artifact-num-to-keep: -1
     - github:
-        url: https://github.com/{repo[org]}/{repo[name]}
+        url: https://github.com/{org}/{repo}
 
     triggers:
     - github-pull-request:
diff --git a/jjb/metal3/job_keep_capm3_e2e_tests.yml b/jjb/metal3/job_keep_capm3_e2e_tests.yml
index 185f8d9..4f01ed4 100644
--- a/jjb/metal3/job_keep_capm3_e2e_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_tests.yml
@@ -26,8 +26,8 @@
 
 - job-template:
     id: keep_capm3_e2e_tests
-    name: '{job_prefix}_keep_{name}_{version}_e2e_test_{image_os}'
-    description: "CAPM3 {capm3_version} e2e tests for {repo[org]}/{repo[name]} on {image_os}."
+    name: '{job_prefix}_keep_{proj}_{version}_e2e_test_{image_os}'
+    description: "CAPM3 {capm3_version} e2e tests for {org}/{repo} on {image_os}."
     project-type: pipeline
     defaults: global
     disabled: False
@@ -35,11 +35,11 @@
     parameters:
     - string:
         name: PROJECT_REPO_ORG
-        default: '{repo[org]}'
+        default: '{org}'
         description: 'Project github repo org name'
     - string:
         name: PROJECT_REPO_NAME
-        default: '{repo[name]}'
+        default: '{repo}'
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
@@ -47,7 +47,7 @@
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
-        default: 'https://github.com/{repo[org]}/{repo[name]}.git'
+        default: 'https://github.com/{org}/{repo}.git'
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
@@ -85,7 +85,7 @@
         artifact-days-to-keep: -1
         artifact-num-to-keep: -1
     - github:
-        url: https://github.com/{repo[org]}/{repo[name]}
+        url: https://github.com/{org}/{repo}
 
     triggers:
     - github-pull-request:
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 12c339f..4b96321 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -221,9 +221,14 @@
 
 - project:
     name: "capm3"
-    repo:
-      org: "metal3-io"
-      name: "cluster-api-provider-metal3"
+    org: metal3-io
+    proj:
+      - capm3:
+          repo: cluster-api-provider-metal3
+      - project_infra:
+          repo: project-infra
+          branch: '${{ghprbActualCommit}}'
+          ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
     image_os:
       - ubuntu
       - centos
@@ -255,6 +260,16 @@
                 capm3_version: v1alpha5
                 target_branches:
                   - 'release-0.5'
+
+- project:
+    name: "capm3-main-tests"
+    repo:
+      org: "metal3-io"
+      name: "cluster-api-provider-metal3"
+    image_os:
+      - ubuntu
+      - centos
+    jobs:
       - capm3_main_e2e_upgrade_tests:
           exclude:
             - image_os: centos