diff --git a/jobs/aws/eks-anywhere/eks-anywhere-development-bundle-presubmit.yaml b/jobs/aws/eks-anywhere/eks-anywhere-development-bundle-presubmit.yaml
new file mode 100644
index 00000000..4b6e3272
--- /dev/null
+++ b/jobs/aws/eks-anywhere/eks-anywhere-development-bundle-presubmit.yaml
@@ -0,0 +1,61 @@
+# 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-anywhere:
+  - name: eks-anywhere-development-bundle-presubmit
+    always_run: false
+    run_if_changed: "release/triggers/bundle-release/development/*"
+    branches:
+    - ^release-.*$
+    cluster: "prow-presubmits-cluster"
+    error_on_eviction: true
+    max_concurrency: 10
+    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-3b142d2084a344f85d18f8793c2d23b4afbb55cd.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          make validate-triggers TYPE=bundle ENV=development
+        resources:
+          requests:
+            memory: "1Gi"
+            cpu: "512m"
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-anywhere/eks-anywhere-development-eks-a-release-presubmit.yaml b/jobs/aws/eks-anywhere/eks-anywhere-development-eks-a-release-presubmit.yaml
new file mode 100644
index 00000000..480cc638
--- /dev/null
+++ b/jobs/aws/eks-anywhere/eks-anywhere-development-eks-a-release-presubmit.yaml
@@ -0,0 +1,61 @@
+# 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-anywhere:
+  - name: eks-anywhere-development-eks-a-release-presubmit
+    always_run: false
+    run_if_changed: "release/triggers/eks-a-release/development/*"
+    branches:
+    - ^release-.*$
+    cluster: "prow-presubmits-cluster"
+    error_on_eviction: true
+    max_concurrency: 10
+    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-3b142d2084a344f85d18f8793c2d23b4afbb55cd.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          make validate-triggers TYPE=eks-a ENV=development
+        resources:
+          requests:
+            memory: "1Gi"
+            cpu: "512m"
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-anywhere/eks-anywhere-production-bundle-presubmit.yaml b/jobs/aws/eks-anywhere/eks-anywhere-production-bundle-presubmit.yaml
new file mode 100644
index 00000000..7a89e45c
--- /dev/null
+++ b/jobs/aws/eks-anywhere/eks-anywhere-production-bundle-presubmit.yaml
@@ -0,0 +1,61 @@
+# 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-anywhere:
+  - name: eks-anywhere-production-bundle-presubmit
+    always_run: false
+    run_if_changed: "release/triggers/bundle-release/production/*"
+    branches:
+    - ^release-.*$
+    cluster: "prow-presubmits-cluster"
+    error_on_eviction: true
+    max_concurrency: 10
+    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-3b142d2084a344f85d18f8793c2d23b4afbb55cd.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          make validate-triggers TYPE=bundle ENV=production
+        resources:
+          requests:
+            memory: "1Gi"
+            cpu: "512m"
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/jobs/aws/eks-anywhere/eks-anywhere-production-eks-a-release-presubmit.yaml b/jobs/aws/eks-anywhere/eks-anywhere-production-eks-a-release-presubmit.yaml
new file mode 100644
index 00000000..df3b5a20
--- /dev/null
+++ b/jobs/aws/eks-anywhere/eks-anywhere-production-eks-a-release-presubmit.yaml
@@ -0,0 +1,61 @@
+# 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-anywhere:
+  - name: eks-anywhere-production-eks-a-release-presubmit
+    always_run: false
+    run_if_changed: "release/triggers/eks-a-release/production/*"
+    branches:
+    - ^release-.*$
+    cluster: "prow-presubmits-cluster"
+    error_on_eviction: true
+    max_concurrency: 10
+    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-3b142d2084a344f85d18f8793c2d23b4afbb55cd.2
+        command:
+        - bash
+        - -c
+        - >
+          trap 'touch /status/done && rm -rf /home/prow/go/src/' EXIT
+          &&
+          make validate-triggers TYPE=eks-a ENV=production
+        resources:
+          requests:
+            memory: "1Gi"
+            cpu: "512m"
+      - command:
+        - sh
+        args:
+        - /disk-usage-script/entrypoint.sh
+        image: public.ecr.aws/amazonlinux/amazonlinux:2
+        name: disk-monitor
diff --git a/scripts/lint_prowjobs/main.go b/scripts/lint_prowjobs/main.go
index eb4687ce..5dcd073b 100644
--- a/scripts/lint_prowjobs/main.go
+++ b/scripts/lint_prowjobs/main.go
@@ -158,6 +158,8 @@ func MakeTargetCheck(jc *JobConstants) presubmitCheck {
 		if strings.Contains(presubmitConfig.JobBase.Name, "e2e") ||
 			strings.Contains(presubmitConfig.JobBase.Name, "lint") ||
 			strings.Contains(presubmitConfig.JobBase.Name, "generate-files") ||
+			strings.Contains(presubmitConfig.JobBase.Name, "bundle") ||
+			strings.Contains(presubmitConfig.JobBase.Name, "eks-a-release") ||
 			presubmitConfig.JobBase.Name == "eks-anywhere-attribution-files-presubmit" ||
 			presubmitConfig.JobBase.Name == "eks-anywhere-cluster-controller-tooling-presubmit" ||
 			presubmitConfig.JobBase.Name == "eks-anywhere-release-tooling-presubmit" ||
diff --git a/templater/jobs/presubmit/eks-anywhere/eks-anywhere-development-bundle-presubmit.yaml b/templater/jobs/presubmit/eks-anywhere/eks-anywhere-development-bundle-presubmit.yaml
new file mode 100644
index 00000000..87b902de
--- /dev/null
+++ b/templater/jobs/presubmit/eks-anywhere/eks-anywhere-development-bundle-presubmit.yaml
@@ -0,0 +1,10 @@
+jobName: eks-anywhere-development-bundle-presubmit
+runIfChanged: release/triggers/bundle-release/development/*
+branches: 
+- ^release-.*$
+commands:
+- make validate-triggers TYPE=bundle ENV=development
+resources:
+  requests:
+    memory: 1Gi
+    cpu: 512m
diff --git a/templater/jobs/presubmit/eks-anywhere/eks-anywhere-development-eks-a-release-presubmit.yaml b/templater/jobs/presubmit/eks-anywhere/eks-anywhere-development-eks-a-release-presubmit.yaml
new file mode 100644
index 00000000..be1523db
--- /dev/null
+++ b/templater/jobs/presubmit/eks-anywhere/eks-anywhere-development-eks-a-release-presubmit.yaml
@@ -0,0 +1,10 @@
+jobName: eks-anywhere-development-eks-a-release-presubmit
+runIfChanged: release/triggers/eks-a-release/development/*
+branches: 
+- ^release-.*$
+commands:
+- make validate-triggers TYPE=eks-a ENV=development
+resources:
+  requests:
+    memory: 1Gi
+    cpu: 512m
diff --git a/templater/jobs/presubmit/eks-anywhere/eks-anywhere-production-bundle-presubmit.yaml b/templater/jobs/presubmit/eks-anywhere/eks-anywhere-production-bundle-presubmit.yaml
new file mode 100644
index 00000000..914ee429
--- /dev/null
+++ b/templater/jobs/presubmit/eks-anywhere/eks-anywhere-production-bundle-presubmit.yaml
@@ -0,0 +1,10 @@
+jobName: eks-anywhere-production-bundle-presubmit
+runIfChanged: release/triggers/bundle-release/production/*
+branches: 
+- ^release-.*$
+commands:
+- make validate-triggers TYPE=bundle ENV=production
+resources:
+  requests:
+    memory: 1Gi
+    cpu: 512m
diff --git a/templater/jobs/presubmit/eks-anywhere/eks-anywhere-production-eks-a-release-presubmit.yaml b/templater/jobs/presubmit/eks-anywhere/eks-anywhere-production-eks-a-release-presubmit.yaml
new file mode 100644
index 00000000..000fc76c
--- /dev/null
+++ b/templater/jobs/presubmit/eks-anywhere/eks-anywhere-production-eks-a-release-presubmit.yaml
@@ -0,0 +1,10 @@
+jobName: eks-anywhere-production-eks-a-release-presubmit
+runIfChanged: release/triggers/eks-a-release/production/*
+branches: 
+- ^release-.*$
+commands:
+- make validate-triggers TYPE=eks-a ENV=production
+resources:
+  requests:
+    memory: 1Gi
+    cpu: 512m