diff --git a/Chart.yaml b/Chart.yaml
index 4a98d74831824c65a6f58d5485b88537b4dcc5e2..391d6af37d4c85aba087220c44f0fa1288e16b4d 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: constraint-templates
-version: 1.6.4
+version: 1.7.0
 appVersion: 1.0.0
diff --git a/templates/constraint_image_admission_controller.yaml b/templates/constraint_image_admission_controller.yaml
index b9cd5b2b2e5f1c83941df309798d2f3309a596fd..afd68f949890ea683ddd63536d485473cf11b8ea 100644
--- a/templates/constraint_image_admission_controller.yaml
+++ b/templates/constraint_image_admission_controller.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: k8simageprovenance
diff --git a/templates/constraint_template_allow_rollout_restart.yaml b/templates/constraint_template_allow_rollout_restart.yaml
index 7622d0bfefeba5326736d43d27474f4e73d32bd4..70e42977708d7392be1620af68e3008ecd78254b 100644
--- a/templates/constraint_template_allow_rollout_restart.yaml
+++ b/templates/constraint_template_allow_rollout_restart.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: allowrolloutrestart
diff --git a/templates/constraint_template_allow_rollout_restart_deployments.yaml b/templates/constraint_template_allow_rollout_restart_deployments.yaml
index 8cc935fdf9dbffa18b86640dd3a378d2ea1615b9..cc9269e923e88c6e0291baf0e1fb3f0ae846a559 100644
--- a/templates/constraint_template_allow_rollout_restart_deployments.yaml
+++ b/templates/constraint_template_allow_rollout_restart_deployments.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: allowrolloutrestartdeployments
diff --git a/templates/constraint_template_allow_rollout_restart_statefulset.yaml b/templates/constraint_template_allow_rollout_restart_statefulset.yaml
index f6b2cb3e82680b225598df492ae5849b1ad42201..3780d2cc9912894937e721b2c7f585dae042567b 100644
--- a/templates/constraint_template_allow_rollout_restart_statefulset.yaml
+++ b/templates/constraint_template_allow_rollout_restart_statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: allowrolloutrestartstatefulsets
diff --git a/templates/constraint_template_authorized_domain_policy.yaml b/templates/constraint_template_authorized_domain_policy.yaml
index 4d4fdea83c1885e6dae7d700fbe35f583cd38755..3da171960282446f752b714e11bed432ed9198f9 100644
--- a/templates/constraint_template_authorized_domain_policy.yaml
+++ b/templates/constraint_template_authorized_domain_policy.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: authorizeddomainpolicy
@@ -10,6 +10,7 @@ spec:
       validation:
         # Schema for the `parameters` field
         openAPIV3Schema:
+          type: object
           properties:
             domains:
               type: array
diff --git a/templates/constraint_template_authorized_storage_classes.yaml b/templates/constraint_template_authorized_storage_classes.yaml
index f0a7885df1381300f114cc28687e49efd4e8e263..1cdf7011f75717f8cb593b19ff21cbf5a533a058 100644
--- a/templates/constraint_template_authorized_storage_classes.yaml
+++ b/templates/constraint_template_authorized_storage_classes.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: pvcstorageclassmatchesnodepool
diff --git a/templates/constraint_template_block_loadbalancer.yaml b/templates/constraint_template_block_loadbalancer.yaml
index 31df777d7f0b86dfb054356283c3cdf66e1decb5..7225196a0e10912385fb657654740b1ae84cfd70 100644
--- a/templates/constraint_template_block_loadbalancer.yaml
+++ b/templates/constraint_template_block_loadbalancer.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: blockloadbalancer
diff --git a/templates/constraint_template_block_nodeport.yaml b/templates/constraint_template_block_nodeport.yaml
index 40b1889f69b6c57aa119f0bc8cf3b32fc91153c0..dfdcf6f606c727623b04706c40a98f59681e908b 100644
--- a/templates/constraint_template_block_nodeport.yaml
+++ b/templates/constraint_template_block_nodeport.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: blocknodeport
diff --git a/templates/constraint_template_container_resource_quotas.yaml b/templates/constraint_template_container_resource_quotas.yaml
index a3ea55157d5c39de9e0f023bace28668d4e11512..fc7e0fb066f42b536261228a2c7f26b44c328200 100644
--- a/templates/constraint_template_container_resource_quotas.yaml
+++ b/templates/constraint_template_container_resource_quotas.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: containerresourcequotas
@@ -10,6 +10,7 @@ spec:
       validation:
         # Schema for the `parameters` field
         openAPIV3Schema:
+          type: object
           properties:
             cpu:
               type: string
diff --git a/templates/constraint_template_flux_tenant.yaml b/templates/constraint_template_flux_tenant.yaml
index dbf47ad40aeb7b0862ffe0bdbdf15d7ef8aea57b..80218242620ad48b2c6aa7477f890d0115dc66c9 100644
--- a/templates/constraint_template_flux_tenant.yaml
+++ b/templates/constraint_template_flux_tenant.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: fluxtenantpolicy
diff --git a/templates/constraint_template_pss_apparmor.yaml b/templates/constraint_template_pss_apparmor.yaml
index 1ab93dd710a54af93917e67195cd02f662c74bfb..7f3ad496bad9ac8f0926e2feeb84b888de5f9ec2 100644
--- a/templates/constraint_template_pss_apparmor.yaml
+++ b/templates/constraint_template_pss_apparmor.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: pssapparmor
diff --git a/templates/constraint_template_pss_host_namespace.yaml b/templates/constraint_template_pss_host_namespace.yaml
index 835bd3133c778d5bba86efc668b128268f61557e..00d41a306477dc849b69340fbccde51e6f84c270 100644
--- a/templates/constraint_template_pss_host_namespace.yaml
+++ b/templates/constraint_template_pss_host_namespace.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: psshostnamespace
diff --git a/templates/constraint_template_pss_hostpath_volume.yaml b/templates/constraint_template_pss_hostpath_volume.yaml
index eadb130ba2f064f3cb78df70f597f1899f4e431d..0ff44e4201d6dedd65eedd5e9d9cd649da2b14ee 100644
--- a/templates/constraint_template_pss_hostpath_volume.yaml
+++ b/templates/constraint_template_pss_hostpath_volume.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: psshostpathvolume
diff --git a/templates/constraint_template_pss_hostport.yaml b/templates/constraint_template_pss_hostport.yaml
index 1f0730844ffa0ea22ae9569047b08761b056d2e5..226be269227dd2062be733f1b77b6bbfad42cea4 100644
--- a/templates/constraint_template_pss_hostport.yaml
+++ b/templates/constraint_template_pss_hostport.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: psshostport
diff --git a/templates/constraint_template_pss_pod_capabilities.yaml b/templates/constraint_template_pss_pod_capabilities.yaml
index dd73b93db67bbfc01039937e3bfbe3e5a7448fe7..388eef511ed85e39fce034913023c8009b66aa34 100644
--- a/templates/constraint_template_pss_pod_capabilities.yaml
+++ b/templates/constraint_template_pss_pod_capabilities.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: psspodcapabilities
diff --git a/templates/constraint_template_pss_privileged.yaml b/templates/constraint_template_pss_privileged.yaml
index 7dd5d9d10807ebd5b258e36951202f6fc224925c..6f9d08e39af166cc98812bbab2713d070e2b0500 100644
--- a/templates/constraint_template_pss_privileged.yaml
+++ b/templates/constraint_template_pss_privileged.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: pssprivilegedpod
diff --git a/templates/constraint_template_pss_procmount.yaml b/templates/constraint_template_pss_procmount.yaml
index bdd64bb9347c3b1d5728503f8508678e3095bf53..4caafb3476a6dd353acc44d7356d06d3662da818 100644
--- a/templates/constraint_template_pss_procmount.yaml
+++ b/templates/constraint_template_pss_procmount.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: pssprocmount
diff --git a/templates/constraint_template_pss_seccomp.yaml b/templates/constraint_template_pss_seccomp.yaml
index e470bba229193bd6e0124d96e79b6691bbcf9bc3..35e5f3a0a3e1461920c5cbd35563f95658529489 100644
--- a/templates/constraint_template_pss_seccomp.yaml
+++ b/templates/constraint_template_pss_seccomp.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: pssseccomp
diff --git a/templates/constraint_template_pss_selinux.yaml b/templates/constraint_template_pss_selinux.yaml
index c1cc025c34c25bf090789fd0602092465174d8e6..238bad887c1c80a6ddd05cd732d7502797412020 100644
--- a/templates/constraint_template_pss_selinux.yaml
+++ b/templates/constraint_template_pss_selinux.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: pssselinux
diff --git a/templates/constraint_template_pss_sysctl_options.yaml b/templates/constraint_template_pss_sysctl_options.yaml
index bacca2b14acded7dadd9e02cb6b75d23dcd886bd..cc82ffe917bd0d30981c20efea65b6a215d06f31 100644
--- a/templates/constraint_template_pss_sysctl_options.yaml
+++ b/templates/constraint_template_pss_sysctl_options.yaml
@@ -1,4 +1,4 @@
-apiVersion: templates.gatekeeper.sh/v1beta1
+apiVersion: templates.gatekeeper.sh/v1
 kind: ConstraintTemplate
 metadata:
   name: psssysctlsoptions