diff --git a/jobs/aws/eks-distro/aws-cloud-controller-manager-1-30-presubmits.yaml b/jobs/aws/eks-distro/aws-cloud-controller-manager-1-30-presubmits.yaml
index 9947e0ad5..b2dc90369 100644
--- a/jobs/aws/eks-distro/aws-cloud-controller-manager-1-30-presubmits.yaml
+++ b/jobs/aws/eks-distro/aws-cloud-controller-manager-1-30-presubmits.yaml
@@ -51,9 +51,9 @@ presubmits:
           &&
           build/lib/local_registry_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $RELEASE_PROJECT_PATH IMAGE_OUTPUT_TYPE=image IMAGE_OUTPUT=push=true; fi
+          make build clean-go-cache clean -C $RELEASE_PROJECT_PATH IMAGE_OUTPUT_TYPE=image IMAGE_OUTPUT=push=true
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+          make build clean-go-cache clean -C $PROJECT_PATH
         env:
         - name: PROJECT_PATH
           value: "projects/kubernetes/cloud-provider-aws"
diff --git a/jobs/aws/eks-distro/aws-cloud-controller-manager-1-31-presubmits.yaml b/jobs/aws/eks-distro/aws-cloud-controller-manager-1-31-presubmits.yaml
new file mode 100644
index 000000000..762ff7722
--- /dev/null
+++ b/jobs/aws/eks-distro/aws-cloud-controller-manager-1-31-presubmits.yaml
@@ -0,0 +1,96 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: aws-cloud-controller-manager-1-31-presubmit
+    always_run: false
+    run_if_changed: "EKS_DISTRO_MINIMAL_BASE_TAG_FILE|^build/lib/.*|Common.mk|projects/kubernetes/cloud-provider-aws/(build|docker|Makefile|1-31)"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      local-registry: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          build/lib/local_registry_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $RELEASE_PROJECT_PATH IMAGE_OUTPUT_TYPE=image IMAGE_OUTPUT=push=true; fi
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/kubernetes/cloud-provider-aws"
+        - name: RELEASE_PROJECT_PATH
+          value: "projects/kubernetes/release"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        - name: IMAGE_REPO
+          value: "localhost:5000"
+        resources:
+          requests:
+            memory: "8Gi"
+            cpu: "1024m"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+      - name: registry
+        image: public.ecr.aws/docker/library/registry:2
+        command:
+        - sh
+        args:
+        - /registry-script/entrypoint.sh
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 5000
+          initialDelaySeconds: 5
+          periodSeconds: 3
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/aws-iam-authenticator-1-30-presubmits.yaml b/jobs/aws/eks-distro/aws-iam-authenticator-1-30-presubmits.yaml
index 1972a29d9..9ed6c1bae 100644
--- a/jobs/aws/eks-distro/aws-iam-authenticator-1-30-presubmits.yaml
+++ b/jobs/aws/eks-distro/aws-iam-authenticator-1-30-presubmits.yaml
@@ -48,11 +48,11 @@ presubmits:
           &&
           build/lib/buildkit_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build -C $PROJECT_PATH; fi
+          make build -C $PROJECT_PATH
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then mv ./projects/kubernetes-sigs/aws-iam-authenticator/_output/tar/* /logs/artifacts; fi
+          mv ./projects/kubernetes-sigs/aws-iam-authenticator/_output/tar/* /logs/artifacts
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make clean-go-cache clean -C $PROJECT_PATH; fi
+          make clean-go-cache clean -C $PROJECT_PATH
         env:
         - name: PROJECT_PATH
           value: "projects/kubernetes-sigs/aws-iam-authenticator"
diff --git a/jobs/aws/eks-distro/aws-iam-authenticator-1-31-presubmits.yaml b/jobs/aws/eks-distro/aws-iam-authenticator-1-31-presubmits.yaml
new file mode 100644
index 000000000..d09b5dedb
--- /dev/null
+++ b/jobs/aws/eks-distro/aws-iam-authenticator-1-31-presubmits.yaml
@@ -0,0 +1,79 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: aws-iam-authenticator-1-31-presubmit
+    always_run: false
+    run_if_changed: "EKS_DISTRO_MINIMAL_BASE_TAG_FILE|^build/lib/.*|Common.mk|projects/kubernetes-sigs/aws-iam-authenticator/(build|docker|Makefile|1-31)"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build -C $PROJECT_PATH; fi
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then mv ./projects/kubernetes-sigs/aws-iam-authenticator/_output/tar/* /logs/artifacts; fi
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make clean-go-cache clean -C $PROJECT_PATH; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/kubernetes-sigs/aws-iam-authenticator"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        resources:
+          requests:
+            memory: "4Gi"
+            cpu: "1024m"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/build-1-27-postsubmits.yaml b/jobs/aws/eks-distro/build-1-27-postsubmits.yaml
index 2af86996a..c0357d793 100644
--- a/jobs/aws/eks-distro/build-1-27-postsubmits.yaml
+++ b/jobs/aws/eks-distro/build-1-27-postsubmits.yaml
@@ -22,7 +22,7 @@ postsubmits:
   aws/eks-distro:
   - name: build-1-27-postsubmit
     always_run: false
-    skip_if_only_changed: "1-28|1-29|1-30|docs/.*|.*.md|go.sum|go.mod|.*Help.mk|.*ATTRIBUTION.txt|LICENSE|NOTICE|OWNERS"
+    skip_if_only_changed: "1-28|1-29|1-30|1-31|docs/.*|.*.md|go.sum|go.mod|.*Help.mk|.*ATTRIBUTION.txt|LICENSE|NOTICE|OWNERS"
     branches:
     - ^main$
     max_concurrency: 10
diff --git a/jobs/aws/eks-distro/build-1-28-postsubmits.yaml b/jobs/aws/eks-distro/build-1-28-postsubmits.yaml
index 5f732bec2..fc86cd40b 100644
--- a/jobs/aws/eks-distro/build-1-28-postsubmits.yaml
+++ b/jobs/aws/eks-distro/build-1-28-postsubmits.yaml
@@ -22,7 +22,7 @@ postsubmits:
   aws/eks-distro:
   - name: build-1-28-postsubmit
     always_run: false
-    skip_if_only_changed: "1-27|1-29|1-30|docs/.*|.*.md|go.sum|go.mod|.*Help.mk|.*ATTRIBUTION.txt|LICENSE|NOTICE|OWNERS"
+    skip_if_only_changed: "1-27|1-29|1-30|1-31|docs/.*|.*.md|go.sum|go.mod|.*Help.mk|.*ATTRIBUTION.txt|LICENSE|NOTICE|OWNERS"
     branches:
     - ^main$
     max_concurrency: 10
diff --git a/jobs/aws/eks-distro/build-1-29-postsubmits.yaml b/jobs/aws/eks-distro/build-1-29-postsubmits.yaml
index 672e9f95e..87e9e12c2 100644
--- a/jobs/aws/eks-distro/build-1-29-postsubmits.yaml
+++ b/jobs/aws/eks-distro/build-1-29-postsubmits.yaml
@@ -22,7 +22,7 @@ postsubmits:
   aws/eks-distro:
   - name: build-1-29-postsubmit
     always_run: false
-    skip_if_only_changed: "1-27|1-28|1-30|docs/.*|.*.md|go.sum|go.mod|.*Help.mk|.*ATTRIBUTION.txt|LICENSE|NOTICE|OWNERS"
+    skip_if_only_changed: "1-27|1-28|1-30|1-31|docs/.*|.*.md|go.sum|go.mod|.*Help.mk|.*ATTRIBUTION.txt|LICENSE|NOTICE|OWNERS"
     branches:
     - ^main$
     max_concurrency: 10
diff --git a/jobs/aws/eks-distro/build-1-30-postsubmits.yaml b/jobs/aws/eks-distro/build-1-30-postsubmits.yaml
index 8633f844b..0fb92da6a 100644
--- a/jobs/aws/eks-distro/build-1-30-postsubmits.yaml
+++ b/jobs/aws/eks-distro/build-1-30-postsubmits.yaml
@@ -22,7 +22,7 @@ postsubmits:
   aws/eks-distro:
   - name: build-1-30-postsubmit
     always_run: false
-    skip_if_only_changed: "1-27|1-28|1-29|docs/.*|.*.md|go.sum|go.mod|.*Help.mk|.*ATTRIBUTION.txt|LICENSE|NOTICE|OWNERS"
+    skip_if_only_changed: "1-27|1-28|1-29|1-31|docs/.*|.*.md|go.sum|go.mod|.*Help.mk|.*ATTRIBUTION.txt|LICENSE|NOTICE|OWNERS"
     branches:
     - ^main$
     max_concurrency: 10
@@ -54,9 +54,9 @@ postsubmits:
           &&
           build/lib/buildkit_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then cp -r "${HOME}/.docker" /home/prow/go/src/github.com/aws/eks-distro; fi
+          cp -r "${HOME}/.docker" /home/prow/go/src/github.com/aws/eks-distro
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make -j2 postsubmit-conformance; fi
+          make -j2 postsubmit-conformance
         env:
         - name: PROJECT_PATH
           value: "projects/kubernetes/kubernetes"
diff --git a/jobs/aws/eks-distro/build-1-31-postsubmits.yaml b/jobs/aws/eks-distro/build-1-31-postsubmits.yaml
new file mode 100644
index 000000000..f86a2bde4
--- /dev/null
+++ b/jobs/aws/eks-distro/build-1-31-postsubmits.yaml
@@ -0,0 +1,101 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+postsubmits:
+  aws/eks-distro:
+  - name: build-1-31-postsubmit
+    always_run: false
+    skip_if_only_changed: "1-27|1-28|1-29|1-30|docs/.*|.*.md|go.sum|go.mod|.*Help.mk|.*ATTRIBUTION.txt|LICENSE|NOTICE|OWNERS"
+    branches:
+    - ^main$
+    max_concurrency: 10
+    error_on_eviction: true
+    cluster: "prow-postsubmits-cluster"
+    skip_report: false
+    decoration_config:
+      timeout: 6h
+      gcs_configuration:
+        bucket: s3://prowdataclusterstack-316434458-prowbucket7c73355c-1n9f9v93wpjcm
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: postsubmits-build-account
+      automountServiceAccountToken: false
+      nodeSelector:
+        arch: AMD64
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then cp -r "${HOME}/.docker" /home/prow/go/src/github.com/aws/eks-distro; fi
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make -j2 postsubmit-conformance; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/kubernetes/kubernetes"
+        - name: TEST_ROLE_ARN
+          value: "arn:aws:iam::125833916567:role/TestBuildRole"
+        - name: ARTIFACT_BUCKET
+          value: "eks-d-postsubmit-artifacts"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        - name: CONTROL_PLANE_INSTANCE_PROFILE
+          value: "arn:aws:iam::125833916567:instance-profile/KopsControlPlaneBuildRole"
+        - name: NODE_INSTANCE_PROFILE
+          value: "arn:aws:iam::125833916567:instance-profile/KopsNodesBuildRole"
+        - name: KOPS_STATE_STORE
+          value: "s3://testbuildstack-125833916-kopsbuildstatestorebucke-d4esen60nfrk"
+        - name: IMAGE_REPO
+          value: "public.ecr.aws/h1r8a7l5"
+        - name: DOCKER_CONFIG
+          value: "/home/prow/go/src/github.com/aws/eks-distro/.docker"
+        resources:
+          requests:
+            memory: "8Gi"
+            cpu: "2"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+        resources:
+          requests:
+            memory: "2Gi"
+            cpu: "1024m"
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/cni-1-30-presubmits.yaml b/jobs/aws/eks-distro/cni-1-30-presubmits.yaml
index 2018f6234..1577df499 100644
--- a/jobs/aws/eks-distro/cni-1-30-presubmits.yaml
+++ b/jobs/aws/eks-distro/cni-1-30-presubmits.yaml
@@ -45,7 +45,7 @@ presubmits:
         - >
           trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+          make build clean-go-cache clean -C $PROJECT_PATH
         env:
         - name: PROJECT_PATH
           value: "projects/containernetworking/plugins"
diff --git a/jobs/aws/eks-distro/cni-1-31-presubmits.yaml b/jobs/aws/eks-distro/cni-1-31-presubmits.yaml
new file mode 100644
index 000000000..98eb74ed0
--- /dev/null
+++ b/jobs/aws/eks-distro/cni-1-31-presubmits.yaml
@@ -0,0 +1,63 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: cni-plugins-1-31-presubmit
+    always_run: false
+    run_if_changed: "^build/lib/.*|Common.mk|projects/containernetworking/plugins/(build|Makefile|1-31)"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/containernetworking/plugins"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        resources:
+          requests:
+            memory: "2Gi"
+            cpu: "1024m"
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/coredns-1-30-presubmits.yaml b/jobs/aws/eks-distro/coredns-1-30-presubmits.yaml
index 1870fcec5..a84801b1c 100644
--- a/jobs/aws/eks-distro/coredns-1-30-presubmits.yaml
+++ b/jobs/aws/eks-distro/coredns-1-30-presubmits.yaml
@@ -48,7 +48,7 @@ presubmits:
           &&
           build/lib/buildkit_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+          make build clean-go-cache clean -C $PROJECT_PATH
         env:
         - name: PROJECT_PATH
           value: "projects/coredns/coredns"
diff --git a/jobs/aws/eks-distro/coredns-1-31-presubmits.yaml b/jobs/aws/eks-distro/coredns-1-31-presubmits.yaml
new file mode 100644
index 000000000..32e3c569b
--- /dev/null
+++ b/jobs/aws/eks-distro/coredns-1-31-presubmits.yaml
@@ -0,0 +1,77 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: coredns-1-31-presubmit
+    always_run: false
+    run_if_changed: "EKS_DISTRO_MINIMAL_BASE_TAG_FILE|^build/lib/.*|Common.mk|projects/coredns/coredns/(build|docker|Makefile|1-31)"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/coredns/coredns"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        - name: FAKE_ARM_ARTIFACTS_FOR_VALIDATION
+          value: "true"
+        resources:
+          requests:
+            memory: "4Gi"
+            cpu: "1024m"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/dev-release-1-30-postsubmits.yaml b/jobs/aws/eks-distro/dev-release-1-30-postsubmits.yaml
index 66168200f..18db7b47b 100644
--- a/jobs/aws/eks-distro/dev-release-1-30-postsubmits.yaml
+++ b/jobs/aws/eks-distro/dev-release-1-30-postsubmits.yaml
@@ -54,7 +54,7 @@ postsubmits:
           &&
           build/lib/buildkit_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then ./release/prow.sh; fi
+          ./release/prow.sh
         env:
         - name: PROJECT_PATH
           value: "projects/kubernetes/kubernetes"
diff --git a/jobs/aws/eks-distro/dev-release-1-31-postsubmits.yaml b/jobs/aws/eks-distro/dev-release-1-31-postsubmits.yaml
new file mode 100644
index 000000000..ca8d13535
--- /dev/null
+++ b/jobs/aws/eks-distro/dev-release-1-31-postsubmits.yaml
@@ -0,0 +1,91 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+postsubmits:
+  aws/eks-distro:
+  - name: dev-release-1-31-postsubmit
+    always_run: false
+    run_if_changed: "release/1-31/development/RELEASE"
+    branches:
+    - ^main$
+    max_concurrency: 1
+    error_on_eviction: true
+    cluster: "prow-postsubmits-cluster"
+    skip_report: false
+    decoration_config:
+      timeout: 4h
+      gcs_configuration:
+        bucket: s3://prowdataclusterstack-316434458-prowbucket7c73355c-1n9f9v93wpjcm
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: postsubmits-build-account
+      automountServiceAccountToken: false
+      nodeSelector:
+        arch: AMD64
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then ./release/prow.sh; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/kubernetes/kubernetes"
+        - name: AWS_REGION
+          value: "us-east-1"
+        - name: ARTIFACT_BUCKET
+          value: "eks-d-postsubmit-artifacts"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        - name: IMAGE_REPO
+          value: "public.ecr.aws/h1r8a7l5"
+        resources:
+          requests:
+            memory: "16Gi"
+            cpu: "4"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+        resources:
+          requests:
+            memory: "2Gi"
+            cpu: "1024m"
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/etcd-1-30-presubmits.yaml b/jobs/aws/eks-distro/etcd-1-30-presubmits.yaml
index 01daf38ac..61d6ab7dd 100644
--- a/jobs/aws/eks-distro/etcd-1-30-presubmits.yaml
+++ b/jobs/aws/eks-distro/etcd-1-30-presubmits.yaml
@@ -48,11 +48,11 @@ presubmits:
           &&
           build/lib/buildkit_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build -C $PROJECT_PATH; fi
+          make build -C $PROJECT_PATH
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then mv ./projects/etcd-io/etcd/_output/tar/* /logs/artifacts; fi
+          mv ./projects/etcd-io/etcd/_output/tar/* /logs/artifacts
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make clean-go-cache clean -C $PROJECT_PATH; fi
+          make clean-go-cache clean -C $PROJECT_PATH
         env:
         - name: PROJECT_PATH
           value: "projects/etcd-io/etcd"
diff --git a/jobs/aws/eks-distro/etcd-1-31-presubmits.yaml b/jobs/aws/eks-distro/etcd-1-31-presubmits.yaml
new file mode 100644
index 000000000..f6a3b7edc
--- /dev/null
+++ b/jobs/aws/eks-distro/etcd-1-31-presubmits.yaml
@@ -0,0 +1,81 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: etcd-1-31-presubmit
+    always_run: false
+    run_if_changed: "EKS_DISTRO_MINIMAL_BASE_TAG_FILE|^build/lib/.*|Common.mk|projects/etcd-io/etcd/(build|docker|Makefile|1-31)"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build -C $PROJECT_PATH; fi
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then mv ./projects/etcd-io/etcd/_output/tar/* /logs/artifacts; fi
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make clean-go-cache clean -C $PROJECT_PATH; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/etcd-io/etcd"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        - name: FAKE_ARM_ARTIFACTS_FOR_VALIDATION
+          value: "true"
+        resources:
+          requests:
+            memory: "4Gi"
+            cpu: "1024m"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/external-attacher-1-30-presubmits.yaml b/jobs/aws/eks-distro/external-attacher-1-30-presubmits.yaml
index 45c906e79..7de802a68 100644
--- a/jobs/aws/eks-distro/external-attacher-1-30-presubmits.yaml
+++ b/jobs/aws/eks-distro/external-attacher-1-30-presubmits.yaml
@@ -48,7 +48,7 @@ presubmits:
           &&
           build/lib/buildkit_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+          make build clean-go-cache clean -C $PROJECT_PATH
         env:
         - name: PROJECT_PATH
           value: "projects/kubernetes-csi/external-attacher"
diff --git a/jobs/aws/eks-distro/external-attacher-1-31-presubmits.yaml b/jobs/aws/eks-distro/external-attacher-1-31-presubmits.yaml
new file mode 100644
index 000000000..59bdd9d10
--- /dev/null
+++ b/jobs/aws/eks-distro/external-attacher-1-31-presubmits.yaml
@@ -0,0 +1,75 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: external-attacher-1-31-presubmit
+    always_run: false
+    run_if_changed: "EKS_DISTRO_MINIMAL_BASE_TAG_FILE|^build/lib/.*|Common.mk|projects/kubernetes-csi/external-attacher/(build|docker|Makefile|1-31)"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/kubernetes-csi/external-attacher"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        resources:
+          requests:
+            memory: "4Gi"
+            cpu: "1024m"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/external-provisioner-1-30-presubmits.yaml b/jobs/aws/eks-distro/external-provisioner-1-30-presubmits.yaml
index fa133b5c9..92b8a1a47 100644
--- a/jobs/aws/eks-distro/external-provisioner-1-30-presubmits.yaml
+++ b/jobs/aws/eks-distro/external-provisioner-1-30-presubmits.yaml
@@ -48,7 +48,7 @@ presubmits:
           &&
           build/lib/buildkit_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+          make build clean-go-cache clean -C $PROJECT_PATH
         env:
         - name: PROJECT_PATH
           value: "projects/kubernetes-csi/external-provisioner"
diff --git a/jobs/aws/eks-distro/external-provisioner-1-31-presubmits.yaml b/jobs/aws/eks-distro/external-provisioner-1-31-presubmits.yaml
new file mode 100644
index 000000000..28dbf1f9b
--- /dev/null
+++ b/jobs/aws/eks-distro/external-provisioner-1-31-presubmits.yaml
@@ -0,0 +1,75 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: external-provisioner-1-31-presubmit
+    always_run: false
+    run_if_changed: "EKS_DISTRO_MINIMAL_BASE_TAG_FILE|^build/lib/.*|Common.mk|projects/kubernetes-csi/external-provisioner/(build|docker|Makefile|1-31)"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/kubernetes-csi/external-provisioner"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        resources:
+          requests:
+            memory: "4Gi"
+            cpu: "1024m"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/external-resizer-1-30-presubmits.yaml b/jobs/aws/eks-distro/external-resizer-1-30-presubmits.yaml
index 9477f6520..2c508f657 100644
--- a/jobs/aws/eks-distro/external-resizer-1-30-presubmits.yaml
+++ b/jobs/aws/eks-distro/external-resizer-1-30-presubmits.yaml
@@ -48,7 +48,7 @@ presubmits:
           &&
           build/lib/buildkit_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+          make build clean-go-cache clean -C $PROJECT_PATH
         env:
         - name: PROJECT_PATH
           value: "projects/kubernetes-csi/external-resizer"
diff --git a/jobs/aws/eks-distro/external-resizer-1-31-presubmits.yaml b/jobs/aws/eks-distro/external-resizer-1-31-presubmits.yaml
new file mode 100644
index 000000000..33a1b6318
--- /dev/null
+++ b/jobs/aws/eks-distro/external-resizer-1-31-presubmits.yaml
@@ -0,0 +1,75 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: external-resizer-1-31-presubmit
+    always_run: false
+    run_if_changed: "EKS_DISTRO_MINIMAL_BASE_TAG_FILE|^build/lib/.*|Common.mk|projects/kubernetes-csi/external-resizer/(build|docker|Makefile|1-31)"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/kubernetes-csi/external-resizer"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        resources:
+          requests:
+            memory: "4Gi"
+            cpu: "1024m"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/external-snapshotter-1-30-presubmits.yaml b/jobs/aws/eks-distro/external-snapshotter-1-30-presubmits.yaml
index 31977965c..76dbdbb17 100644
--- a/jobs/aws/eks-distro/external-snapshotter-1-30-presubmits.yaml
+++ b/jobs/aws/eks-distro/external-snapshotter-1-30-presubmits.yaml
@@ -48,7 +48,7 @@ presubmits:
           &&
           build/lib/buildkit_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+          make build clean-go-cache clean -C $PROJECT_PATH
         env:
         - name: PROJECT_PATH
           value: "projects/kubernetes-csi/external-snapshotter"
diff --git a/jobs/aws/eks-distro/external-snapshotter-1-31-presubmits.yaml b/jobs/aws/eks-distro/external-snapshotter-1-31-presubmits.yaml
new file mode 100644
index 000000000..d90371700
--- /dev/null
+++ b/jobs/aws/eks-distro/external-snapshotter-1-31-presubmits.yaml
@@ -0,0 +1,75 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: external-snapshotter-1-31-presubmit
+    always_run: false
+    run_if_changed: "EKS_DISTRO_MINIMAL_BASE_TAG_FILE|^build/lib/.*|Common.mk|projects/kubernetes-csi/external-snapshotter/(build|docker|Makefile|1-31)"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/kubernetes-csi/external-snapshotter"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        resources:
+          requests:
+            memory: "8Gi"
+            cpu: "2048m"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/kops-build-1-30-presubmits.yaml b/jobs/aws/eks-distro/kops-build-1-30-presubmits.yaml
index 9dc777420..ee3ad3e66 100644
--- a/jobs/aws/eks-distro/kops-build-1-30-presubmits.yaml
+++ b/jobs/aws/eks-distro/kops-build-1-30-presubmits.yaml
@@ -46,7 +46,7 @@ presubmits:
         - >
           trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build kops; fi
+          make build kops
         env:
         - name: PROJECT_PATH
           value: "development/kops"
diff --git a/jobs/aws/eks-distro/kops-build-1-31-presubmits.yaml b/jobs/aws/eks-distro/kops-build-1-31-presubmits.yaml
new file mode 100644
index 000000000..b8a4ba380
--- /dev/null
+++ b/jobs/aws/eks-distro/kops-build-1-31-presubmits.yaml
@@ -0,0 +1,68 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: kops-build-1-31-presubmits
+    always_run: false
+    run_if_changed: "development/kops/.*"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      timeout: 6h
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build kops; fi
+        env:
+        - name: PROJECT_PATH
+          value: "development/kops"
+        - name: ARTIFACT_BUCKET
+          value: "eks-d-postsubmit-artifacts"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        - name: IMAGE_REPO
+          value: "public.ecr.aws/h1r8a7l5"
+        resources:
+          requests:
+            memory: "8Gi"
+            cpu: "2"
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/kubernetes-1-30-presubmits.yaml b/jobs/aws/eks-distro/kubernetes-1-30-presubmits.yaml
index 1f1062405..0f3201f05 100644
--- a/jobs/aws/eks-distro/kubernetes-1-30-presubmits.yaml
+++ b/jobs/aws/eks-distro/kubernetes-1-30-presubmits.yaml
@@ -51,13 +51,13 @@ presubmits:
           &&
           build/lib/local_registry_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $RELEASE_PROJECT_PATH IMAGE_OUTPUT_TYPE=image IMAGE_OUTPUT=push=true; fi
+          make build clean-go-cache clean -C $RELEASE_PROJECT_PATH IMAGE_OUTPUT_TYPE=image IMAGE_OUTPUT=push=true
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build -C $PROJECT_PATH; fi
+          make build -C $PROJECT_PATH
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then mv ./projects/kubernetes/kubernetes/_output/${RELEASE_BRANCH}/* /logs/artifacts; fi
+          mv ./projects/kubernetes/kubernetes/_output/${RELEASE_BRANCH}/* /logs/artifacts
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make clean-go-cache clean -C $PROJECT_PATH; fi
+          make clean-go-cache clean -C $PROJECT_PATH
         env:
         - name: PROJECT_PATH
           value: "projects/kubernetes/kubernetes"
diff --git a/jobs/aws/eks-distro/kubernetes-1-30-test-presubmits.yaml b/jobs/aws/eks-distro/kubernetes-1-30-test-presubmits.yaml
index ef4979a31..660905970 100644
--- a/jobs/aws/eks-distro/kubernetes-1-30-test-presubmits.yaml
+++ b/jobs/aws/eks-distro/kubernetes-1-30-test-presubmits.yaml
@@ -45,7 +45,7 @@ presubmits:
         - >
           trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make test -C $PROJECT_PATH; fi
+          make test -C $PROJECT_PATH
         env:
         - name: PROJECT_PATH
           value: "projects/kubernetes/kubernetes"
diff --git a/jobs/aws/eks-distro/kubernetes-1-31-presubmits.yaml b/jobs/aws/eks-distro/kubernetes-1-31-presubmits.yaml
new file mode 100644
index 000000000..abce6d62e
--- /dev/null
+++ b/jobs/aws/eks-distro/kubernetes-1-31-presubmits.yaml
@@ -0,0 +1,100 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: kubernetes-1-31-presubmit
+    always_run: false
+    run_if_changed: "EKS_DISTRO_MINIMAL_BASE_TAG_FILE|EKS_DISTRO_MINIMAL_BASE_IPTABLES_TAG_FILE|^build/lib/.*|Common.mk|projects/kubernetes/kubernetes/(build|docker|Makefile|1-31)"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      local-registry: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          build/lib/local_registry_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $RELEASE_PROJECT_PATH IMAGE_OUTPUT_TYPE=image IMAGE_OUTPUT=push=true; fi
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build -C $PROJECT_PATH; fi
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then mv ./projects/kubernetes/kubernetes/_output/${RELEASE_BRANCH}/* /logs/artifacts; fi
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make clean-go-cache clean -C $PROJECT_PATH; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/kubernetes/kubernetes"
+        - name: RELEASE_PROJECT_PATH
+          value: "projects/kubernetes/release"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        - name: IMAGE_REPO
+          value: "localhost:5000"
+        resources:
+          requests:
+            memory: "32Gi"
+            cpu: "16"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+      - name: registry
+        image: public.ecr.aws/docker/library/registry:2
+        command:
+        - sh
+        args:
+        - /registry-script/entrypoint.sh
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 5000
+          initialDelaySeconds: 5
+          periodSeconds: 3
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/kubernetes-1-31-test-presubmits.yaml b/jobs/aws/eks-distro/kubernetes-1-31-test-presubmits.yaml
new file mode 100644
index 000000000..8be4db0d1
--- /dev/null
+++ b/jobs/aws/eks-distro/kubernetes-1-31-test-presubmits.yaml
@@ -0,0 +1,63 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: kubernetes-1-31-test-presubmit
+    always_run: false
+    run_if_changed: "projects/kubernetes/kubernetes/1-31/(GIT_TAG|patches|GOLANG_VERSION)"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make test -C $PROJECT_PATH; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/kubernetes/kubernetes"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        resources:
+          requests:
+            memory: "32Gi"
+            cpu: "16"
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/kubernetes-release-1-30-presubmits.yaml b/jobs/aws/eks-distro/kubernetes-release-1-30-presubmits.yaml
index 4d68ab9ef..1c2f6bcd6 100644
--- a/jobs/aws/eks-distro/kubernetes-release-1-30-presubmits.yaml
+++ b/jobs/aws/eks-distro/kubernetes-release-1-30-presubmits.yaml
@@ -48,7 +48,7 @@ presubmits:
           &&
           build/lib/buildkit_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+          make build clean-go-cache clean -C $PROJECT_PATH
         env:
         - name: PROJECT_PATH
           value: "projects/kubernetes/release"
diff --git a/jobs/aws/eks-distro/kubernetes-release-1-31-presubmits.yaml b/jobs/aws/eks-distro/kubernetes-release-1-31-presubmits.yaml
new file mode 100644
index 000000000..69bb67a00
--- /dev/null
+++ b/jobs/aws/eks-distro/kubernetes-release-1-31-presubmits.yaml
@@ -0,0 +1,75 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: kubernetes-release-1-31-presubmit
+    always_run: false
+    run_if_changed: "EKS_DISTRO_MINIMAL_BASE_TAG_FILE|^build/lib/.*|Common.mk|projects/kubernetes/release/(build|docker|Makefile|1-31)"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/kubernetes/release"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        resources:
+          requests:
+            memory: "8Gi"
+            cpu: "2048m"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/livenessprobe-1-30-presubmits.yaml b/jobs/aws/eks-distro/livenessprobe-1-30-presubmits.yaml
index 6919f371c..77cc81f2d 100644
--- a/jobs/aws/eks-distro/livenessprobe-1-30-presubmits.yaml
+++ b/jobs/aws/eks-distro/livenessprobe-1-30-presubmits.yaml
@@ -51,7 +51,7 @@ presubmits:
           &&
           build/lib/local_registry_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache images clean -C $PROJECT_PATH; fi
+          make build clean-go-cache images clean -C $PROJECT_PATH
         env:
         - name: PROJECT_PATH
           value: "projects/kubernetes-csi/livenessprobe"
diff --git a/jobs/aws/eks-distro/livenessprobe-1-31-presubmits.yaml b/jobs/aws/eks-distro/livenessprobe-1-31-presubmits.yaml
new file mode 100644
index 000000000..42c98d14a
--- /dev/null
+++ b/jobs/aws/eks-distro/livenessprobe-1-31-presubmits.yaml
@@ -0,0 +1,92 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: livenessprobe-1-31-presubmit
+    always_run: false
+    run_if_changed: "EKS_DISTRO_MINIMAL_BASE_TAG_FILE|EKS_DISTRO_WINDOWS_BASE_.*_FILE|^build/lib/.*|Common.mk|projects/kubernetes-csi/livenessprobe/(build|docker|Makefile|1-31)"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      local-registry: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          build/lib/local_registry_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache images clean -C $PROJECT_PATH; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/kubernetes-csi/livenessprobe"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        - name: IMAGE_REPO
+          value: "localhost:5000"
+        resources:
+          requests:
+            memory: "4Gi"
+            cpu: "1024m"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+      - name: registry
+        image: public.ecr.aws/docker/library/registry:2
+        command:
+        - sh
+        args:
+        - /registry-script/entrypoint.sh
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 5000
+          initialDelaySeconds: 5
+          periodSeconds: 3
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/metrics-server-1-30-presubmits.yaml b/jobs/aws/eks-distro/metrics-server-1-30-presubmits.yaml
index dbb590d41..011732890 100644
--- a/jobs/aws/eks-distro/metrics-server-1-30-presubmits.yaml
+++ b/jobs/aws/eks-distro/metrics-server-1-30-presubmits.yaml
@@ -48,7 +48,7 @@ presubmits:
           &&
           build/lib/buildkit_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+          make build clean-go-cache clean -C $PROJECT_PATH
         env:
         - name: PROJECT_PATH
           value: "projects/kubernetes-sigs/metrics-server"
diff --git a/jobs/aws/eks-distro/metrics-server-1-31-presubmits.yaml b/jobs/aws/eks-distro/metrics-server-1-31-presubmits.yaml
new file mode 100644
index 000000000..8af34f21e
--- /dev/null
+++ b/jobs/aws/eks-distro/metrics-server-1-31-presubmits.yaml
@@ -0,0 +1,75 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: metrics-server-1-31-presubmit
+    always_run: false
+    run_if_changed: "EKS_DISTRO_MINIMAL_BASE_TAG_FILE|^build/lib/.*|Common.mk|projects/kubernetes-sigs/metrics-server/(build|docker|Makefile|1-31)"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache clean -C $PROJECT_PATH; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/kubernetes-sigs/metrics-server"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        resources:
+          requests:
+            memory: "4Gi"
+            cpu: "1024m"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/node-driver-registrar-1-30-presubmits.yaml b/jobs/aws/eks-distro/node-driver-registrar-1-30-presubmits.yaml
index ce31254fb..ea22d912b 100644
--- a/jobs/aws/eks-distro/node-driver-registrar-1-30-presubmits.yaml
+++ b/jobs/aws/eks-distro/node-driver-registrar-1-30-presubmits.yaml
@@ -51,7 +51,7 @@ presubmits:
           &&
           build/lib/local_registry_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache images clean -C $PROJECT_PATH; fi
+          make build clean-go-cache images clean -C $PROJECT_PATH
         env:
         - name: PROJECT_PATH
           value: "projects/kubernetes-csi/node-driver-registrar"
diff --git a/jobs/aws/eks-distro/node-driver-registrar-1-31-presubmits.yaml b/jobs/aws/eks-distro/node-driver-registrar-1-31-presubmits.yaml
new file mode 100644
index 000000000..7d28868b5
--- /dev/null
+++ b/jobs/aws/eks-distro/node-driver-registrar-1-31-presubmits.yaml
@@ -0,0 +1,92 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+presubmits:
+  aws/eks-distro:
+  - name: node-driver-registrar-1-31-presubmit
+    always_run: false
+    run_if_changed: "EKS_DISTRO_MINIMAL_BASE_TAG_FILE|EKS_DISTRO_WINDOWS_BASE_.*_FILE|^build/lib/.*|Common.mk|projects/kubernetes-csi/node-driver-registrar/(build|docker|Makefile|1-31)"
+    max_concurrency: 10
+    cluster: "prow-presubmits-cluster"
+    skip_report: false
+    decoration_config:
+      gcs_configuration:
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      local-registry: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: presubmits-build-account
+      automountServiceAccountToken: false
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          build/lib/local_registry_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then make build clean-go-cache images clean -C $PROJECT_PATH; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/kubernetes-csi/node-driver-registrar"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        - name: IMAGE_REPO
+          value: "localhost:5000"
+        resources:
+          requests:
+            memory: "4Gi"
+            cpu: "1024m"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+      - name: registry
+        image: public.ecr.aws/docker/library/registry:2
+        command:
+        - sh
+        args:
+        - /registry-script/entrypoint.sh
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 5000
+          initialDelaySeconds: 5
+          periodSeconds: 3
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-distro/prod-release-1-30-postsubmits.yaml b/jobs/aws/eks-distro/prod-release-1-30-postsubmits.yaml
index 56b7e4908..97bc0950e 100644
--- a/jobs/aws/eks-distro/prod-release-1-30-postsubmits.yaml
+++ b/jobs/aws/eks-distro/prod-release-1-30-postsubmits.yaml
@@ -54,7 +54,7 @@ postsubmits:
           &&
           build/lib/buildkit_check.sh
           &&
-          if make check-for-supported-release-branch -C $PROJECT_PATH; then ./release/prow-release.sh; fi
+          ./release/prow-release.sh
         env:
         - name: PROJECT_PATH
           value: "projects/kubernetes/kubernetes"
diff --git a/jobs/aws/eks-distro/prod-release-1-31-postsubmits.yaml b/jobs/aws/eks-distro/prod-release-1-31-postsubmits.yaml
new file mode 100644
index 000000000..e5fceb5ee
--- /dev/null
+++ b/jobs/aws/eks-distro/prod-release-1-31-postsubmits.yaml
@@ -0,0 +1,95 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+# IMPORTANT: This Prowjob was generated by running `make prowjobs -C templater`.
+# DO NOT EDIT THIS FILE BY HAND! Refer to docs/prowjobs.md for instructions on
+# how to add a new Prowjob or update an existing Prowjob.
+################################################################################
+
+postsubmits:
+  aws/eks-distro:
+  - name: prod-release-1-31-postsubmit
+    always_run: false
+    run_if_changed: "release/1-31/production/RELEASE"
+    branches:
+    - ^main$
+    max_concurrency: 1
+    error_on_eviction: true
+    cluster: "prow-postsubmits-cluster"
+    skip_report: false
+    decoration_config:
+      timeout: 4h
+      gcs_configuration:
+        bucket: s3://prowdataclusterstack-316434458-prowbucket7c73355c-1n9f9v93wpjcm
+        path_strategy: explicit
+      s3_credentials_secret: s3-credentials
+    labels:
+      image-build: "true"
+      disk-usage: "true"
+    spec:
+      serviceaccountName: release-build-account
+      automountServiceAccountToken: false
+      nodeSelector:
+        arch: AMD64
+      containers:
+      - name: build-container
+        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-95f6c7fbe5127cce34fd05f3a75daf135c712410.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done' EXIT
+          &&
+          build/lib/buildkit_check.sh
+          &&
+          if make check-for-supported-release-branch -C $PROJECT_PATH; then ./release/prow-release.sh; fi
+        env:
+        - name: PROJECT_PATH
+          value: "projects/kubernetes/kubernetes"
+        - name: ARTIFACT_DEPLOYMENT_ROLE_ARN
+          value: "arn:aws:iam::379412251201:role/ArtifactDeploymentRole"
+        - name: AWS_REGION
+          value: "us-east-1"
+        - name: RELEASE_ENVIRONMENT
+          value: "production"
+        - name: ARTIFACT_BUCKET
+          value: "artifactsstack-3794122512-artifactsbucket2aac5544-1f3dgu9wrpiz2"
+        - name: RELEASE_BRANCH
+          value: "1-31"
+        - name: IMAGE_REPO
+          value: "public.ecr.aws/eks-distro"
+        resources:
+          requests:
+            memory: "16Gi"
+            cpu: "4"
+      - name: buildkitd
+        image: moby/buildkit:v0.12.3-rootless
+        command:
+        - sh
+        args:
+        - /script/entrypoint.sh
+        securityContext:
+          runAsUser: 1000
+          runAsGroup: 1000
+        resources:
+          requests:
+            memory: "2Gi"
+            cpu: "1024m"
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/templater/jobs/utils/utils.go b/templater/jobs/utils/utils.go
index 5cdd15ab2..ead2d3614 100644
--- a/templater/jobs/utils/utils.go
+++ b/templater/jobs/utils/utils.go
@@ -18,6 +18,7 @@ var releaseBranches = []string{
 	"1-28",
 	"1-29",
 	"1-30",
+	"1-31",
 }
 
 var k8releaseBranches = []string{