diff --git a/jobs/aws/eks-distro-build-tooling/eks-distro-base-presubmits-golang-1-20-al-2.yaml b/jobs/aws/eks-distro-build-tooling/eks-distro-base-presubmits-golang-1-20-al-2.yaml
deleted file mode 100644
index 03644f376..000000000
--- a/jobs/aws/eks-distro-build-tooling/eks-distro-base-presubmits-golang-1-20-al-2.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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-build-tooling:
-  - name: eks-distro-base-tooling-presubmits-golang-1-20-al-2
-    always_run: false
-    run_if_changed: "eks-distro-base/.*|scripts/setup_public_ecr_push.sh"
-    max_concurrency: 10
-    cluster: "prow-presubmits-cluster"
-    skip_report: false
-    extra_refs:
-    - org: eks-distro-pr-bot
-      repo: eks-distro-build-tooling
-      base_ref: main
-    - org: eks-distro-pr-bot
-      repo: eks-distro
-      base_ref: main
-    - org: eks-distro-pr-bot
-      repo: eks-anywhere-build-tooling
-      base_ref: main
-    - org: eks-distro-pr-bot
-      repo: eks-anywhere
-      base_ref: main
-    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:minimal-205ba0c417cb05b1c3e2f10165edd578f7abf6bd.2
-        command:
-        - bash
-        - -c
-        - >
-          trap '(docker buildx rm eks-d-builders || true) && touch /status/done && rm -rf /home/prow/go/src/' EXIT
-          &&
-          scripts/buildkit_check.sh
-          &&
-          scripts/local_registry_check.sh
-          &&
-          scripts/setup_buildx.sh
-          &&
-          export DATE_EPOCH=$(date "+%F-%s")
-          &&
-          make golang-1.20-compiler-images -C $PROJECT_PATH IMAGE_TAG=${DATE_EPOCH}.${AL_TAG}
-          &&
-          make create-pr -C $PROJECT_PATH IMAGE_TAG=${DATE_EPOCH}.${AL_TAG}
-        env:
-        - name: PROJECT_PATH
-          value: "eks-distro-base"
-        - name: AL_TAG
-          value: "2"
-        - name: IMAGE_REPO
-          value: "localhost:5000"
-        - name: PLATFORMS
-          value: "linux/amd64"
-        - name: BUILDKITD_IMAGE
-          value: "moby/buildkit:v0.12.3-rootless"
-        - name: USE_BUILDX
-          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
-      - 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-build-tooling/eks-distro-base-presubmits-golang-1-20-al-2023.yaml b/jobs/aws/eks-distro-build-tooling/eks-distro-base-presubmits-golang-1-20-al-2023.yaml
deleted file mode 100644
index 29fb61b7b..000000000
--- a/jobs/aws/eks-distro-build-tooling/eks-distro-base-presubmits-golang-1-20-al-2023.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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-build-tooling:
-  - name: eks-distro-base-tooling-presubmits-golang-1-20-al-2023
-    always_run: false
-    run_if_changed: "eks-distro-base/.*|scripts/setup_public_ecr_push.sh"
-    max_concurrency: 10
-    cluster: "prow-presubmits-cluster"
-    skip_report: false
-    extra_refs:
-    - org: eks-distro-pr-bot
-      repo: eks-distro-build-tooling
-      base_ref: main
-    - org: eks-distro-pr-bot
-      repo: eks-distro
-      base_ref: main
-    - org: eks-distro-pr-bot
-      repo: eks-anywhere-build-tooling
-      base_ref: main
-    - org: eks-distro-pr-bot
-      repo: eks-anywhere
-      base_ref: main
-    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:minimal-205ba0c417cb05b1c3e2f10165edd578f7abf6bd.2
-        command:
-        - bash
-        - -c
-        - >
-          trap '(docker buildx rm eks-d-builders || true) && touch /status/done && rm -rf /home/prow/go/src/' EXIT
-          &&
-          scripts/buildkit_check.sh
-          &&
-          scripts/local_registry_check.sh
-          &&
-          scripts/setup_buildx.sh
-          &&
-          export DATE_EPOCH=$(date "+%F-%s")
-          &&
-          make golang-1.20-compiler-images -C $PROJECT_PATH IMAGE_TAG=${DATE_EPOCH}.${AL_TAG}
-          &&
-          make create-pr -C $PROJECT_PATH IMAGE_TAG=${DATE_EPOCH}.${AL_TAG}
-        env:
-        - name: PROJECT_PATH
-          value: "eks-distro-base"
-        - name: AL_TAG
-          value: "2023"
-        - name: IMAGE_REPO
-          value: "localhost:5000"
-        - name: PLATFORMS
-          value: "linux/amd64"
-        - name: BUILDKITD_IMAGE
-          value: "moby/buildkit:v0.12.3-rootless"
-        - name: USE_BUILDX
-          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
-      - 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-build-tooling/golang-1-20-ARM64-PROD-postsubmits.yaml b/jobs/aws/eks-distro-build-tooling/golang-1-20-ARM64-PROD-postsubmits.yaml
deleted file mode 100644
index 24f04675e..000000000
--- a/jobs/aws/eks-distro-build-tooling/golang-1-20-ARM64-PROD-postsubmits.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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-build-tooling:
-  - name: golang-1-20-ARM64-PROD-tooling-postsubmit
-    always_run: false
-    run_if_changed: "projects/golang/go/1.20/RELEASE"
-    branches:
-    - ^main$
-    max_concurrency: 10
-    error_on_eviction: true
-    cluster: "prow-postsubmits-cluster"
-    skip_report: false
-    decoration_config:
-      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: true
-      nodeSelector:
-        arch: ARM64
-      containers:
-      - name: build-container
-        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-205ba0c417cb05b1c3e2f10165edd578f7abf6bd.2
-        command:
-        - bash
-        - -c
-        - >
-          trap 'touch /status/done' EXIT
-          &&
-          scripts/buildkit_check.sh
-          &&
-          make install-deps -C $PROJECT_PATH
-          &&
-          projects/golang/go/scripts/prow_release.sh
-        env:
-        - name: PROJECT_PATH
-          value: "projects/golang/go"
-        - name: GO_SOURCE_VERSION
-          value: "1.20"
-        - name: SKIP_PRIVILEGED_TESTS
-          value: "true"
-        - name: ARTIFACTS_BUCKET
-          value: "artifactsstack-3794122512-artifactsbucket2aac5544-1f3dgu9wrpiz2"
-        - name: ARCHITECTURE
-          value: "ARM64"
-        - name: ARTIFACT_DEPLOYMENT_ROLE_ARN
-          value: "arn:aws:iam::379412251201:role/ArtifactDeploymentRole"
-        - name: AWS_REGION
-          value: "us-east-1"
-        - name: IMAGE_REPO
-          value: "public.ecr.aws/eks-distro-build-tooling"
-        - name: ECR_PUBLIC_PUSH_ROLE_ARN
-          value: "arn:aws:iam::832188789588:role/ECRPublicPushRole"
-        resources:
-          requests:
-            memory: "16Gi"
-            cpu: "2560m"
-          limits:
-            memory: "16Gi"
-            cpu: "2560m"
-      - 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-build-tooling/golang-1-20-ARM64-postsubmits.yaml b/jobs/aws/eks-distro-build-tooling/golang-1-20-ARM64-postsubmits.yaml
deleted file mode 100644
index 2547095cc..000000000
--- a/jobs/aws/eks-distro-build-tooling/golang-1-20-ARM64-postsubmits.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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-build-tooling:
-  - name: golang-1-20-ARM64-tooling-postsubmit
-    always_run: false
-    run_if_changed: "projects/golang/go/1.20/.*|projects/golang/go/Makefile"
-    branches:
-    - ^main$
-    max_concurrency: 10
-    error_on_eviction: true
-    cluster: "prow-postsubmits-cluster"
-    skip_report: false
-    decoration_config:
-      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: ARM64
-      containers:
-      - name: build-container
-        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-205ba0c417cb05b1c3e2f10165edd578f7abf6bd.2
-        command:
-        - bash
-        - -c
-        - >
-          trap 'touch /status/done' EXIT
-          &&
-          scripts/buildkit_check.sh
-          &&
-          make install-deps -C $PROJECT_PATH
-          &&
-          make release -C $PROJECT_PATH
-        env:
-        - name: PROJECT_PATH
-          value: "projects/golang/go"
-        - name: GO_SOURCE_VERSION
-          value: "1.20"
-        - name: SKIP_PRIVILEGED_TESTS
-          value: "true"
-        - name: ARTIFACTS_BUCKET
-          value: "eks-d-postsubmit-artifacts"
-        - name: ARCHITECTURE
-          value: "ARM64"
-        resources:
-          requests:
-            memory: "16Gi"
-            cpu: "2560m"
-          limits:
-            memory: "16Gi"
-            cpu: "2560m"
-      - 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-build-tooling/golang-1-20-PROD-images-postsubmits.yaml b/jobs/aws/eks-distro-build-tooling/golang-1-20-PROD-images-postsubmits.yaml
deleted file mode 100644
index 8f360d2e5..000000000
--- a/jobs/aws/eks-distro-build-tooling/golang-1-20-PROD-images-postsubmits.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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-build-tooling:
-  - name: golang-1-20-PROD-images-tooling-postsubmit
-    always_run: false
-    run_if_changed: "projects/golang/go/docker/debianBase/RELEASE"
-    branches:
-    - ^main$
-    max_concurrency: 10
-    error_on_eviction: true
-    cluster: "prow-postsubmits-cluster"
-    skip_report: false
-    decoration_config:
-      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: true
-      nodeSelector:
-        arch: AMD64
-      containers:
-      - name: build-container
-        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-205ba0c417cb05b1c3e2f10165edd578f7abf6bd.2
-        command:
-        - bash
-        - -c
-        - >
-          trap 'touch /status/done' EXIT
-          &&
-          scripts/buildkit_check.sh
-          &&
-          make install-deps -C $PROJECT_PATH
-          &&
-          projects/golang/go/scripts/prow_release_images.sh
-          &&
-          projects/golang/go/scripts/debian_image_release_notification.sh
-        env:
-        - name: PROJECT_PATH
-          value: "projects/golang/go"
-        - name: GO_SOURCE_VERSION
-          value: "1.20"
-        - name: AWS_REGION
-          value: "us-east-1"
-        - name: IMAGE_REPO
-          value: "public.ecr.aws/eks-distro-build-tooling"
-        - name: ECR_PUBLIC_PUSH_ROLE_ARN
-          value: "arn:aws:iam::832188789588:role/ECRPublicPushRole"
-        - name: SNS_TOPIC_ARN
-          value: "arn:aws:sns:us-east-1:379412251201:eks-golang-image-updates"
-        - name: ARTIFACT_DEPLOYMENT_ROLE_ARN
-          value: "arn:aws:iam::379412251201:role/ArtifactDeploymentRole"
-        resources:
-          requests:
-            memory: "2Gi"
-            cpu: "1"
-      - 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-build-tooling/golang-1-20-PROD-postsubmits.yaml b/jobs/aws/eks-distro-build-tooling/golang-1-20-PROD-postsubmits.yaml
deleted file mode 100644
index 6f58497d2..000000000
--- a/jobs/aws/eks-distro-build-tooling/golang-1-20-PROD-postsubmits.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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-build-tooling:
-  - name: golang-1-20-PROD-tooling-postsubmit
-    always_run: false
-    run_if_changed: "projects/golang/go/1.20/RELEASE"
-    branches:
-    - ^main$
-    max_concurrency: 10
-    error_on_eviction: true
-    cluster: "prow-postsubmits-cluster"
-    skip_report: false
-    decoration_config:
-      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: true
-      nodeSelector:
-        arch: AMD64
-      containers:
-      - name: build-container
-        image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-205ba0c417cb05b1c3e2f10165edd578f7abf6bd.2
-        command:
-        - bash
-        - -c
-        - >
-          trap 'touch /status/done' EXIT
-          &&
-          scripts/buildkit_check.sh
-          &&
-          make install-deps -C $PROJECT_PATH
-          &&
-          projects/golang/go/scripts/prow_release.sh
-          &&
-          projects/golang/go/scripts/eks_golang_release_notification.sh
-        env:
-        - name: PROJECT_PATH
-          value: "projects/golang/go"
-        - name: GO_SOURCE_VERSION
-          value: "1.20"
-        - name: SKIP_PRIVILEGED_TESTS
-          value: "true"
-        - name: ARTIFACTS_BUCKET
-          value: "artifactsstack-3794122512-artifactsbucket2aac5544-1f3dgu9wrpiz2"
-        - name: ARTIFACT_DEPLOYMENT_ROLE_ARN
-          value: "arn:aws:iam::379412251201:role/ArtifactDeploymentRole"
-        - name: AWS_REGION
-          value: "us-east-1"
-        - name: IMAGE_REPO
-          value: "public.ecr.aws/eks-distro-build-tooling"
-        - name: ECR_PUBLIC_PUSH_ROLE_ARN
-          value: "arn:aws:iam::832188789588:role/ECRPublicPushRole"
-        - name: SNS_TOPIC_ARN
-          value: "arn:aws:sns:us-east-1:379412251201:eks-golang-updates"
-        resources:
-          requests:
-            memory: "16Gi"
-            cpu: "2560m"
-          limits:
-            memory: "16Gi"
-            cpu: "2560m"
-      - 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-build-tooling/golang-1-20-postsubmits.yaml b/jobs/aws/eks-distro-build-tooling/golang-1-20-postsubmits.yaml
deleted file mode 100644
index 0ad192c03..000000000
--- a/jobs/aws/eks-distro-build-tooling/golang-1-20-postsubmits.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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-build-tooling:
-  - name: golang-1-20-tooling-postsubmit
-    always_run: false
-    run_if_changed: "projects/golang/go/1.20/.*|projects/golang/go/Makefile"
-    branches:
-    - ^main$
-    max_concurrency: 10
-    error_on_eviction: true
-    cluster: "prow-postsubmits-cluster"
-    skip_report: false
-    decoration_config:
-      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-205ba0c417cb05b1c3e2f10165edd578f7abf6bd.2
-        command:
-        - bash
-        - -c
-        - >
-          trap 'touch /status/done' EXIT
-          &&
-          scripts/buildkit_check.sh
-          &&
-          make install-deps -C $PROJECT_PATH
-          &&
-          make release -C $PROJECT_PATH
-        env:
-        - name: PROJECT_PATH
-          value: "projects/golang/go"
-        - name: GO_SOURCE_VERSION
-          value: "1.20"
-        - name: SKIP_PRIVILEGED_TESTS
-          value: "true"
-        - name: ARTIFACTS_BUCKET
-          value: "eks-d-postsubmit-artifacts"
-        resources:
-          requests:
-            memory: "16Gi"
-            cpu: "2560m"
-          limits:
-            memory: "16Gi"
-            cpu: "2560m"
-      - 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-build-tooling/golang-1-20-presubmits.yaml b/jobs/aws/eks-distro-build-tooling/golang-1-20-presubmits.yaml
deleted file mode 100644
index 1cc7cc969..000000000
--- a/jobs/aws/eks-distro-build-tooling/golang-1-20-presubmits.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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-build-tooling:
-  - name: golang-1-20-tooling-presubmit
-    always_run: false
-    run_if_changed: "projects/golang/go/Makefile|projects/golang/go/1.20/.*|projects/golang/go/docker/debianBase/.*"
-    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-205ba0c417cb05b1c3e2f10165edd578f7abf6bd.2
-        command:
-        - bash
-        - -c
-        - >
-          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
-          &&
-          scripts/buildkit_check.sh
-          &&
-          make install-deps -C $PROJECT_PATH
-          &&
-          make build -C $PROJECT_PATH
-        env:
-        - name: PROJECT_PATH
-          value: "projects/golang/go"
-        - name: GO_SOURCE_VERSION
-          value: "1.20"
-        - name: SKIP_PRIVILEGED_TESTS
-          value: "true"
-        - name: ARTIFACTS_BUCKET
-          value: "eks-d-postsubmit-artifacts"
-        resources:
-          requests:
-            memory: "16Gi"
-            cpu: "2560m"
-      - 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-tooling/golang-1-21-PROD-images-postsubmits.yaml b/jobs/aws/eks-distro-build-tooling/golang-1-21-PROD-images-postsubmits.yaml
index 60c1d0c85..fdd27169c 100644
--- a/jobs/aws/eks-distro-build-tooling/golang-1-21-PROD-images-postsubmits.yaml
+++ b/jobs/aws/eks-distro-build-tooling/golang-1-21-PROD-images-postsubmits.yaml
@@ -22,7 +22,7 @@ postsubmits:
   aws/eks-distro-build-tooling:
   - name: golang-1-21-PROD-images-tooling-postsubmit
     always_run: false
-    run_if_changed: "projects/golang/go/docker/debianBase/RELEASE"
+    run_if_changed: "eks-distro-base/golang_versions.yaml"
     branches:
     - ^main$
     max_concurrency: 10
diff --git a/jobs/aws/eks-distro-build-tooling/golang-1-21-presubmits.yaml b/jobs/aws/eks-distro-build-tooling/golang-1-21-presubmits.yaml
index 1cc7e2c28..f8ef09541 100644
--- a/jobs/aws/eks-distro-build-tooling/golang-1-21-presubmits.yaml
+++ b/jobs/aws/eks-distro-build-tooling/golang-1-21-presubmits.yaml
@@ -50,7 +50,7 @@ presubmits:
           &&
           make install-deps -C $PROJECT_PATH
           &&
-          make build -C $PROJECT_PATH
+          projects/golang/go/scripts/prow_release_images.sh
         env:
         - name: PROJECT_PATH
           value: "projects/golang/go"
@@ -58,8 +58,18 @@ presubmits:
           value: "1.21"
         - name: SKIP_PRIVILEGED_TESTS
           value: "true"
-        - name: ARTIFACTS_BUCKET
-          value: "eks-d-postsubmit-artifacts"
+        - name: PUSH_IMAGES
+          value: "false"
+        - name: AWS_REGION
+          value: "us-east-1"
+        - name: IMAGE_REPO
+          value: "public.ecr.aws/eks-distro-build-tooling"
+        - name: ECR_PUBLIC_PUSH_ROLE_ARN
+          value: "arn:aws:iam::832188789588:role/ECRPublicPushRole"
+        - name: SNS_TOPIC_ARN
+          value: "arn:aws:sns:us-east-1:379412251201:eks-golang-image-updates"
+        - name: ARTIFACT_DEPLOYMENT_ROLE_ARN
+          value: "arn:aws:iam::379412251201:role/ArtifactDeploymentRole"
         resources:
           requests:
             memory: "16Gi"
diff --git a/jobs/aws/eks-distro-build-tooling/golang-1-22-PROD-images-postsubmits.yaml b/jobs/aws/eks-distro-build-tooling/golang-1-22-PROD-images-postsubmits.yaml
index 45518a6e8..ed190f76e 100644
--- a/jobs/aws/eks-distro-build-tooling/golang-1-22-PROD-images-postsubmits.yaml
+++ b/jobs/aws/eks-distro-build-tooling/golang-1-22-PROD-images-postsubmits.yaml
@@ -22,7 +22,7 @@ postsubmits:
   aws/eks-distro-build-tooling:
   - name: golang-1-22-PROD-images-tooling-postsubmit
     always_run: false
-    run_if_changed: "projects/golang/go/docker/debianBase/RELEASE"
+    run_if_changed: "eks-distro-base/golang_versions.yaml"
     branches:
     - ^main$
     max_concurrency: 10
diff --git a/jobs/aws/eks-distro-build-tooling/golang-1-22-presubmits.yaml b/jobs/aws/eks-distro-build-tooling/golang-1-22-presubmits.yaml
index 26921b778..b67b200c2 100644
--- a/jobs/aws/eks-distro-build-tooling/golang-1-22-presubmits.yaml
+++ b/jobs/aws/eks-distro-build-tooling/golang-1-22-presubmits.yaml
@@ -50,7 +50,7 @@ presubmits:
           &&
           make install-deps -C $PROJECT_PATH
           &&
-          make build -C $PROJECT_PATH
+          projects/golang/go/scripts/prow_release_images.sh
         env:
         - name: PROJECT_PATH
           value: "projects/golang/go"
@@ -58,8 +58,18 @@ presubmits:
           value: "1.22"
         - name: SKIP_PRIVILEGED_TESTS
           value: "true"
-        - name: ARTIFACTS_BUCKET
-          value: "eks-d-postsubmit-artifacts"
+        - name: PUSH_IMAGES
+          value: "false"
+        - name: AWS_REGION
+          value: "us-east-1"
+        - name: IMAGE_REPO
+          value: "public.ecr.aws/eks-distro-build-tooling"
+        - name: ECR_PUBLIC_PUSH_ROLE_ARN
+          value: "arn:aws:iam::832188789588:role/ECRPublicPushRole"
+        - name: SNS_TOPIC_ARN
+          value: "arn:aws:sns:us-east-1:379412251201:eks-golang-image-updates"
+        - name: ARTIFACT_DEPLOYMENT_ROLE_ARN
+          value: "arn:aws:iam::379412251201:role/ArtifactDeploymentRole"
         resources:
           requests:
             memory: "16Gi"
diff --git a/templater/jobs/postsubmit/eks-distro-build-tooling/golang-1-X-PROD-images-postsubmits.yaml b/templater/jobs/postsubmit/eks-distro-build-tooling/golang-1-X-PROD-images-postsubmits.yaml
index d8084426e..7bfb61974 100644
--- a/templater/jobs/postsubmit/eks-distro-build-tooling/golang-1-X-PROD-images-postsubmits.yaml
+++ b/templater/jobs/postsubmit/eks-distro-build-tooling/golang-1-X-PROD-images-postsubmits.yaml
@@ -1,5 +1,5 @@
 jobName: golang-{{ .jobGoVersion }}-PROD-images-tooling-postsubmit
-runIfChanged: projects/golang/go/docker/debianBase/RELEASE
+runIfChanged: eks-distro-base/golang_versions.yaml
 imageBuild: true
 automountServiceAccountToken: true
 commands:
@@ -23,4 +23,4 @@ envVars:
   - name: SNS_TOPIC_ARN
     value: arn:aws:sns:us-east-1:379412251201:eks-golang-image-updates
   - name: ARTIFACT_DEPLOYMENT_ROLE_ARN
-    value: arn:aws:iam::379412251201:role/ArtifactDeploymentRole
\ No newline at end of file
+    value: arn:aws:iam::379412251201:role/ArtifactDeploymentRole
diff --git a/templater/jobs/postsubmit/eks-distro-build-tooling/golang-1-X-PROD-postsubmits.yaml b/templater/jobs/postsubmit/eks-distro-build-tooling/golang-1-X-PROD-postsubmits.yaml
index 9bd675892..1993f9e01 100644
--- a/templater/jobs/postsubmit/eks-distro-build-tooling/golang-1-X-PROD-postsubmits.yaml
+++ b/templater/jobs/postsubmit/eks-distro-build-tooling/golang-1-X-PROD-postsubmits.yaml
@@ -31,4 +31,4 @@ envVars:
     value: arn:aws:iam::832188789588:role/ECRPublicPushRole
   - name: SNS_TOPIC_ARN
     value: arn:aws:sns:us-east-1:379412251201:eks-golang-updates
-serviceAccountName: release-build-account
\ No newline at end of file
+serviceAccountName: release-build-account
diff --git a/templater/jobs/presubmit/eks-distro-build-tooling/golang-1-X-presubmits.yaml b/templater/jobs/presubmit/eks-distro-build-tooling/golang-1-X-presubmits.yaml
index 0d7c857ce..9d81656a3 100644
--- a/templater/jobs/presubmit/eks-distro-build-tooling/golang-1-X-presubmits.yaml
+++ b/templater/jobs/presubmit/eks-distro-build-tooling/golang-1-X-presubmits.yaml
@@ -3,7 +3,7 @@ runIfChanged: projects/golang/go/Makefile|projects/golang/go/{{ .golangVersion }
 imageBuild: true
 commands:
 - make install-deps -C $PROJECT_PATH
-- make build -C $PROJECT_PATH
+- projects/golang/go/scripts/prow_release_images.sh
 projectPath: projects/golang/go
 resources:
   limits:
@@ -17,5 +17,15 @@ envVars:
     value: "{{ .golangVersion }}"
   - name: SKIP_PRIVILEGED_TESTS
     value: true
-  - name: ARTIFACTS_BUCKET
-    value: eks-d-postsubmit-artifacts
\ No newline at end of file
+  - name: PUSH_IMAGES
+    value: false
+  - name: AWS_REGION
+    value: us-east-1
+  - name: IMAGE_REPO
+    value: public.ecr.aws/eks-distro-build-tooling
+  - name: ECR_PUBLIC_PUSH_ROLE_ARN
+    value: arn:aws:iam::832188789588:role/ECRPublicPushRole
+  - name: SNS_TOPIC_ARN
+    value: arn:aws:sns:us-east-1:379412251201:eks-golang-image-updates
+  - name: ARTIFACT_DEPLOYMENT_ROLE_ARN
+    value: arn:aws:iam::379412251201:role/ArtifactDeploymentRole
diff --git a/templater/jobs/utils/utils.go b/templater/jobs/utils/utils.go
index c0577da17..5cdd15ab2 100644
--- a/templater/jobs/utils/utils.go
+++ b/templater/jobs/utils/utils.go
@@ -28,7 +28,6 @@ var k8releaseBranches = []string{
 }
 
 var golangVersions = []string{
-	"1-20",
 	"1-21",
 	"1-22",
 }