diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 115c57c..633b207 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -25,9 +25,6 @@
 # jobs associated with that github repository. The job definitions can be found
 # in job_{job_id}.yml files in any of JJB include folders.
 
-# NOTE: kubectl_sha256 needs to match the kubernetes_version_upgrade_to version in 1.5/main
-# and it needs to match kubernetes_version_upgrade_from in 1.3/1.4
-
 - project:
     name: 'nordix_dev_tools'
     branch: '${{ghprbActualCommit}}'
@@ -37,8 +34,8 @@
     - update_nordix_repos
     - artifact_cleanup
     repo:
-        org: "Nordix"
-        name: "metal3-dev-tools"
+      org: "Nordix"
+      name: "metal3-dev-tools"
     ci_github_jenkins_credentials_id: 'nordix-metal3-ci-github-prod-token'
     ci_ghprb_auth_id: '86c49704-5474-4524-97b7-805323b2c39a'
     ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
@@ -66,8 +63,8 @@
 - project:
     name: 'project_infra'
     repo:
-        org: "metal3-io"
-        name: "project-infra"
+      org: "metal3-io"
+      name: "project-infra"
     jobs:
     - fullstack_project-infra_building
     - periodic_fullstack_building
@@ -383,35 +380,30 @@
         - 1-29-1-30:
             k8s_version_upgrade_from: v1.29.0
             k8s_version_upgrade_to: v1.30.0
-            kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
         - 1-29-1-30:
             k8s_version_upgrade_from: v1.29.0
             k8s_version_upgrade_to: v1.30.0
-            kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
             capm3_release_branch: release-1.8
             bmo_release_branch: release-0.8
             capm3_target_branch: release-1-8
         - 1-29-1-30:
             k8s_version_upgrade_from: v1.29.0
             k8s_version_upgrade_to: v1.30.0
-            kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
             capm3_release_branch: release-1.7
             bmo_release_branch: release-0.6
             capm3_target_branch: release-1-7
         - 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
         - 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
@@ -442,7 +434,6 @@
         - 1-29-1-30:
             k8s_version_upgrade_from: v1.29.0
             k8s_version_upgrade_to: v1.30.0
-            kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
@@ -450,7 +441,6 @@
         - 1-29-1-30:
             k8s_version_upgrade_from: v1.29.0
             k8s_version_upgrade_to: v1.30.0
-            kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
             capm3_release_branch: release-1.8
             bmo_release_branch: release-0.8
             capm3_target_branch: release-1-8
@@ -458,7 +448,6 @@
         - 1-29-1-30:
             k8s_version_upgrade_from: v1.29.0
             k8s_version_upgrade_to: v1.30.0
-            kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
             capm3_release_branch: release-1.7
             bmo_release_branch: release-0.6
             capm3_target_branch: release-1-7
@@ -466,7 +455,6 @@
         - 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
@@ -474,7 +462,6 @@
         - 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