diff --git a/.github/workflows/readme-gh-pages-sync.yaml b/.github/workflows/readme-gh-pages-sync.yaml
index 4ace8317a..9a26abc40 100644
--- a/.github/workflows/readme-gh-pages-sync.yaml
+++ b/.github/workflows/readme-gh-pages-sync.yaml
@@ -17,7 +17,7 @@ jobs:
       contents: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
diff --git a/.github/workflows/release-pr.yaml b/.github/workflows/release-pr.yaml
index b98cc0765..913c844b8 100644
--- a/.github/workflows/release-pr.yaml
+++ b/.github/workflows/release-pr.yaml
@@ -29,11 +29,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+      uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
       with:
         egress-policy: audit
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-    - uses: zgosalvez/github-actions-ensure-sha-pinned-actions@d5d20e15f2736816ee0e001ba8b24b54d9ffcff4 # v5.0.0
+    - uses: zgosalvez/github-actions-ensure-sha-pinned-actions@70c4af2ed5282c51ba40566d026d6647852ffa3e # v5.0.1
 
   matrix_k8s_node_versions:
     runs-on: ubuntu-latest
@@ -62,13 +62,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
+      - uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0.6.4.0.0
         with:
           install: false
 
@@ -90,7 +90,7 @@ jobs:
           - gateway-operator
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
       - name: Checkout
@@ -102,7 +102,7 @@ jobs:
         with:
           python-version: "3.11"
 
-      - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
+      - uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0.6.4.0.0
 
       - name: Set up chart-testing
         uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f # v2.8.0
@@ -153,13 +153,13 @@ jobs:
           - gateway-operator
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
+      - uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0.6.4.0.0
 
       - name: setup testing environment (kind-cluster)
         env:
@@ -188,13 +188,13 @@ jobs:
     name: golden-tests
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
       - name: checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
+      - uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0.6.4.0.0
 
       - name: build helm chart dependency
         run: |
@@ -225,7 +225,7 @@ jobs:
     if: always()
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
       - if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
diff --git a/.github/workflows/release-push.yaml b/.github/workflows/release-push.yaml
index 18652be82..72c364d79 100644
--- a/.github/workflows/release-push.yaml
+++ b/.github/workflows/release-push.yaml
@@ -21,7 +21,7 @@ jobs:
       contents: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
       - name: Checkout
@@ -34,7 +34,7 @@ jobs:
           git config user.name "$GITHUB_ACTOR"
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
-      - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
+      - uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0.6.4.0.0
 
       - name: Add dependency chart repos
         run: |
diff --git a/.github/workflows/sync-kubernetes-configuration-crds.yaml b/.github/workflows/sync-kubernetes-configuration-crds.yaml
index d33408259..9b4cd5016 100644
--- a/.github/workflows/sync-kubernetes-configuration-crds.yaml
+++ b/.github/workflows/sync-kubernetes-configuration-crds.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
       - name: Checkout
diff --git a/.tools_versions.yaml b/.tools_versions.yaml
index 31d6336bd..351a1a18d 100644
--- a/.tools_versions.yaml
+++ b/.tools_versions.yaml
@@ -1,5 +1,5 @@
 # renovate: datasource=github-releases depName=stackrox/kube-linter
-kube-linter: "0.8.1"
+kube-linter: "0.8.3"
 # renovate: datasource=github-releases depName=jlandowner/helm-chartsnap
 chartsnap: "0.6.0"
 # renovate: datasource=github-releases depName=koalaman/shellcheck
diff --git a/charts/gateway-operator/ci/__snapshots__/kgo-1-4-0-values.snap b/charts/gateway-operator/ci/__snapshots__/kgo-1-4-0-values.snap
deleted file mode 100644
index 0360a900c..000000000
--- a/charts/gateway-operator/ci/__snapshots__/kgo-1-4-0-values.snap
+++ /dev/null
@@ -1,807 +0,0 @@
-# chartsnap: snapshot_version=v3
----
-# Source: gateway-operator/templates/service-account.yaml
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: controller-manager
-  namespace: default
----
-# Source: gateway-operator/templates/cluster-role-lte-1.4.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: chartsnap-gateway-operator-manager-role
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  - serviceaccounts
-  - services
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - configmaps/status
-  - serviceaccounts/status
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - patch
-- apiGroups:
-  - ""
-  resources:
-  - namespaces
-  - pods
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - nodes
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - services/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - admissionregistration.k8s.io
-  resources:
-  - validatingwebhookconfigurations
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - customresourcedefinitions
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - apps
-  resources:
-  - deployments
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - apps
-  resources:
-  - deployments/status
-  verbs:
-  - get
-- apiGroups:
-  - autoscaling
-  resources:
-  - horizontalpodautoscalers
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - watch
-- apiGroups:
-  - batch
-  resources:
-  - jobs
-  verbs:
-  - create
-  - delete
-  - get
-- apiGroups:
-  - cert-manager.io
-  resources:
-  - certificates
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - configuration.konghq.com
-  resources:
-  - ingressclassparameterses
-  - kongclusterplugins
-  - kongcustomentities
-  - kongingresses
-  - konglicenses
-  - kongupstreampolicies
-  - tcpingresses
-  - udpingresses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - configuration.konghq.com
-  resources:
-  - kongcacertificates
-  - kongcertificates
-  - kongconsumergroups
-  - kongconsumers
-  - kongcredentialacls
-  - kongcredentialapikeys
-  - kongcredentialbasicauths
-  - kongcredentialhmacs
-  - kongcredentialjwts
-  - kongdataplaneclientcertificates
-  - kongkeys
-  - kongkeysets
-  - kongroutes
-  - kongservices
-  - kongsnis
-  - kongtargets
-  - kongupstreams
-  - kongvaults
-  verbs:
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - configuration.konghq.com
-  resources:
-  - kongcacertificates/finalizers
-  - kongcacertificates/status
-  - kongcertificates/finalizers
-  - kongcertificates/status
-  - kongconsumergroups/finalizers
-  - kongconsumers/finalizers
-  - kongcredentialacls/finalizers
-  - kongcredentialacls/status
-  - kongcredentialapikeys/finalizers
-  - kongcredentialapikeys/status
-  - kongcredentialbasicauths/finalizers
-  - kongcredentialbasicauths/status
-  - kongcredentialhmacs/finalizers
-  - kongcredentialhmacs/status
-  - kongcredentialjwts/finalizers
-  - kongcredentialjwts/status
-  - kongdataplaneclientcertificates/finalizers
-  - kongdataplaneclientcertificates/status
-  - kongkeys/finalizers
-  - kongkeys/status
-  - kongkeysets/finalizers
-  - kongkeysets/status
-  - kongpluginbindings/status
-  - kongroutes/finalizers
-  - kongroutes/status
-  - kongservices/finalizers
-  - kongservices/status
-  - kongsnis/finalizers
-  - kongsnis/status
-  - kongtargets/finalizers
-  - kongtargets/status
-  - kongupstreams/finalizers
-  - kongupstreams/status
-  - kongvaults/finalizers
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - configuration.konghq.com
-  resources:
-  - kongclusterplugins/status
-  - kongconsumergroups/status
-  - kongconsumers/status
-  - kongcustomentities/status
-  - kongingresses/status
-  - konglicenses/status
-  - kongplugins/status
-  - kongupstreampolicies/status
-  - kongvaults/status
-  - tcpingresses/status
-  - udpingresses/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - configuration.konghq.com
-  resources:
-  - kongpluginbindings
-  - kongplugins
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - discovery.k8s.io
-  resources:
-  - endpointslices
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - gateway-operator.konghq.com
-  resources:
-  - aigateways
-  - controlplanes
-  - dataplanes
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - gateway-operator.konghq.com
-  resources:
-  - aigateways/finalizers
-  - controlplanes/finalizers
-  - dataplanes/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - gateway-operator.konghq.com
-  resources:
-  - aigateways/status
-  - controlplanes/status
-  - dataplanes/status
-  - kongplugininstallations/status
-  - konnectextensions/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - gateway-operator.konghq.com
-  resources:
-  - dataplanemetricsextensions
-  - gatewayconfigurations
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - gateway-operator.konghq.com
-  resources:
-  - kongplugininstallations
-  - konnectextensions
-  verbs:
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - gateway-operator.konghq.com
-  resources:
-  - konnectextensions/finalizers
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - gatewayclasses
-  - grpcroutes
-  - referencegrants
-  - tcproutes
-  - tlsroutes
-  - udproutes
-  - backendtlspolicies
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - gatewayclasses/status
-  - gateways/status
-  - grpcroutes/status
-  - backendtlspolicies/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - gateways
-  - httproutes
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - gateways/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - httproutes/status
-  - tcproutes/status
-  - tlsroutes/status
-  - udproutes/status
-  verbs:
-  - get
-  - update
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - referencegrants/status
-  verbs:
-  - get
-- apiGroups:
-  - incubator.ingress-controller.konghq.com
-  resources:
-  - kongservicefacades
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - incubator.ingress-controller.konghq.com
-  resources:
-  - kongservicefacades/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - konnect.konghq.com
-  resources:
-  - konnectapiauthconfigurations
-  - konnectgatewaycontrolplanes
-  verbs:
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - konnect.konghq.com
-  resources:
-  - konnectapiauthconfigurations/finalizers
-  - konnectgatewaycontrolplanes/finalizers
-  - konnectgatewaycontrolplanes/status
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - konnect.konghq.com
-  resources:
-  - konnectapiauthconfigurations/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingressclasses
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingresses/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - networkpolicies
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - policy
-  resources:
-  - poddisruptionbudgets
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - rbac.authorization.k8s.io
-  resources:
-  - clusterrolebindings
-  - clusterroles
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - rbac.authorization.k8s.io
-  resources:
-  - clusterrolebindings/status
-  - clusterroles/status
-  verbs:
-  - get
-- apiGroups:
-  - rbac.authorization.k8s.io
-  resources:
-  - rolebindings
-  - roles
-  verbs:
-  - create
-  - delete
-  - get
----
-# Source: gateway-operator/templates/rbac-resources.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  creationTimestamp: null
-  name: chartsnap-gateway-operator-kong-mtls-secret-role
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - get
-  - list
-  - create
-  - patch
-  - update
----
-# Source: gateway-operator/templates/rbac-resources.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: chartsnap-gateway-operator-metrics-reader
-rules:
-- nonResourceURLs:
-  - /metrics
-  verbs:
-  - get
----
-# Source: gateway-operator/templates/rbac-resources.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: chartsnap-gateway-operator-proxy-role
-rules:
-- apiGroups:
-  - authentication.k8s.io
-  resources:
-  - tokenreviews
-  verbs:
-  - create
-- apiGroups:
-  - authorization.k8s.io
-  resources:
-  - subjectaccessreviews
-  verbs:
-  - create
----
-# Source: gateway-operator/templates/rbac-resources.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: chartsnap-gateway-operator-kong-mtls-secret-rolebinding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: chartsnap-gateway-operator-kong-mtls-secret-role
-subjects:
-- kind: ServiceAccount
-  name: controller-manager
-  namespace: default
----
-# Source: gateway-operator/templates/rbac-resources.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: chartsnap-gateway-operator-manager-rolebinding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: chartsnap-gateway-operator-manager-role
-subjects:
-- kind: ServiceAccount
-  name: controller-manager
-  namespace: default
----
-# Source: gateway-operator/templates/rbac-resources.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: chartsnap-gateway-operator-proxy-rolebinding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: chartsnap-gateway-operator-proxy-role
-subjects:
-- kind: ServiceAccount
-  name: controller-manager
-  namespace: default
----
-# Source: gateway-operator/templates/rbac-resources.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: chartsnap-gateway-operator-leader-election-role
-  namespace: default
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - get
-  - list
-  - watch
-  - create
-  - update
-  - patch
-  - delete
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - get
-  - list
-  - watch
-  - create
-  - update
-  - patch
-  - delete
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - patch
----
-# Source: gateway-operator/templates/rbac-resources.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: chartsnap-gateway-operator-leader-election-rolebinding
-  namespace: default
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: chartsnap-gateway-operator-leader-election-role
-subjects:
-- kind: ServiceAccount
-  name: controller-manager
-  namespace: default
----
-# Source: gateway-operator/templates/rbac-resources.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    control-plane: controller-manager
-  name: chartsnap-gateway-operator-metrics-service
-  namespace: default
-spec:
-  ports:
-  - name: https
-    port: 8443
-    protocol: TCP
-    targetPort: https
-  selector:
-    control-plane: controller-manager
----
-# Source: gateway-operator/templates/services.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/component: kgo
-  name: chartsnap-gateway-operator
-  namespace: default
-spec:
-  ports:
-  - name: https
-    port: 8443
-    protocol: TCP
-    targetPort: https
-  selector:
-    app.kubernetes.io/component: kgo
----
-# Source: gateway-operator/templates/deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app.kubernetes.io/name: gateway-operator
-    helm.sh/chart: gateway-operator-0.6.1
-    app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "1.6"
-    app.kubernetes.io/component: kgo
-  name: chartsnap-gateway-operator-controller-manager
-  namespace: default
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: gateway-operator
-      app.kubernetes.io/component: kgo
-      app.kubernetes.io/instance: "chartsnap"
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      annotations:
-        kubectl.kubernetes.io/default-container: manager
-      labels:
-        control-plane: controller-manager
-        app.kubernetes.io/name: gateway-operator
-        helm.sh/chart: gateway-operator-0.6.1
-        app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "1.6"
-        app.kubernetes.io/component: kgo
-        app: chartsnap-gateway-operator
-        version: "1.6"
-    spec:
-      containers:
-      - name: manager
-        env:
-        - name: GATEWAY_OPERATOR_ANONYMOUS_REPORTS
-          value: "false"
-        - name: GATEWAY_OPERATOR_HEALTH_PROBE_BIND_ADDRESS
-          value: ":8081"
-        - name: GATEWAY_OPERATOR_METRICS_BIND_ADDRESS
-          value: "0.0.0.0:8080"
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        image: "docker.io/kong/gateway-operator:1.4"
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 8081
-          initialDelaySeconds: 1
-          periodSeconds: 1
-        readinessProbe:
-          httpGet:
-            path: /readyz
-            port: 8081
-          initialDelaySeconds: 1
-          periodSeconds: 1
-        resources:
-          limits:
-            cpu: 500m
-            memory: 256Mi
-          requests:
-            cpu: 10m
-            memory: 128Mi
-        securityContext:
-          allowPrivilegeEscalation: false
-          readOnlyRootFilesystem: true
-          runAsNonRoot: true
-          seccompProfile:
-            type: RuntimeDefault
-          capabilities:
-            drop:
-            - ALL
-        ports:
-        - containerPort: 8081
-          name: probe
-          protocol: TCP
-        - containerPort: 8080
-          name: metrics
-          protocol: TCP
-        volumeMounts:
-        - name: chartsnap-gateway-operator-certs-dir
-          mountPath: /tmp/k8s-webhook-server/serving-certs
-      - args:
-        - --secure-listen-address=0.0.0.0:8443
-        - --upstream=http://127.0.0.1:8080/
-        - --logtostderr=true
-        - --v=0
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
-        name: kube-rbac-proxy
-        ports:
-        - containerPort: 8443
-          name: https
-          protocol: TCP
-        securityContext:
-          readOnlyRootFilesystem: true
-        resources:
-          limits:
-            cpu: 500m
-            memory: 128Mi
-          requests:
-            cpu: 5m
-            memory: 64Mi
-      securityContext:
-        runAsNonRoot: true
-      serviceAccountName: controller-manager
-      terminationGracePeriodSeconds: 10
-      volumes:
-      - name: chartsnap-gateway-operator-certs-dir
-        emptyDir:
-          sizeLimit: 256Mi
diff --git a/charts/gateway-operator/ci/kgo-1-4-0-values.yaml b/charts/gateway-operator/ci/kgo-1-4-0-values.yaml
deleted file mode 100644
index b15ad83ae..000000000
--- a/charts/gateway-operator/ci/kgo-1-4-0-values.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-image:
-  tag: "1.4"
-
-livenessProbe:
-  httpGet:
-    path: /healthz
-    port: 8081
-  initialDelaySeconds: 1
-  periodSeconds: 1
-
-readinessProbe:
-  initialDelaySeconds: 1
-  periodSeconds: 1
-
-env:
-  anonymous_reports: "false"
diff --git a/charts/ingress/CHANGELOG.md b/charts/ingress/CHANGELOG.md
index f7ff21a45..3bf15d482 100644
--- a/charts/ingress/CHANGELOG.md
+++ b/charts/ingress/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.23.0
+
+- Bumped dependencies on `kong/kong` chart to `==3.1.0`. Review the [kong chart
+  changelog](https://github.com/Kong/charts/blob/main/charts/kong/CHANGELOG.md#310)
+  for details.
+
 ## 0.22.0
 
 - Bumped dependencies on `kong/kong` chart to `==3.0.2`. Review the [kong chart
diff --git a/charts/ingress/Chart.lock b/charts/ingress/Chart.lock
index fe473e922..ad5a83c3a 100644
--- a/charts/ingress/Chart.lock
+++ b/charts/ingress/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: kong
   repository: https://charts.konghq.com
-  version: 3.0.2
+  version: 3.1.0
 - name: kong
   repository: https://charts.konghq.com
-  version: 3.0.2
-digest: sha256:9b311dddeb75e337558846b234b23e174d6788709aeff7355083883f836c3457
-generated: "2026-01-10T12:39:48.156045+01:00"
+  version: 3.1.0
+digest: sha256:66abcfbc7083e75e174f9bab82b08f94da356fdccdc817efee75ac2520a56a1f
+generated: "2026-03-12T14:37:43.887277+01:00"
diff --git a/charts/ingress/Chart.yaml b/charts/ingress/Chart.yaml
index d97feb714..28b32ee83 100644
--- a/charts/ingress/Chart.yaml
+++ b/charts/ingress/Chart.yaml
@@ -8,16 +8,16 @@ maintainers:
 name: ingress
 sources:
   - https://github.com/Kong/charts/tree/main/charts/ingress
-version: 0.22.0
+version: 0.23.0
 appVersion: "3.9"
 dependencies:
   - name: kong
-    version: "=3.0.2"
+    version: "=3.1.0"
     repository: https://charts.konghq.com
     alias: controller
     condition: controller.enabled
   - name: kong
-    version: "=3.0.2"
+    version: "=3.1.0"
     repository: https://charts.konghq.com
     alias: gateway
     condition: gateway.enabled
diff --git a/charts/ingress/ci/__snapshots__/gateway-discovery-values.snap b/charts/ingress/ci/__snapshots__/gateway-discovery-values.snap
index 44e678964..6957b4a23 100644
--- a/charts/ingress/ci/__snapshots__/gateway-discovery-values.snap
+++ b/charts/ingress/ci/__snapshots__/gateway-discovery-values.snap
@@ -8,7 +8,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -21,7 +21,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: gateway
-    helm.sh/chart: gateway-3.0.2
+    helm.sh/chart: gateway-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -34,7 +34,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -51,7 +51,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -68,7 +68,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -85,7 +85,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -100,7 +100,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -550,7 +550,7 @@ metadata:
   name: chartsnap-controller
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -571,7 +571,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -641,7 +641,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -662,7 +662,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -674,7 +674,7 @@ spec:
     targetPort: webhook
   selector:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -688,7 +688,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -704,7 +704,7 @@ spec:
     targetPort: cstatus
   selector:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -718,7 +718,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: gateway
-    helm.sh/chart: gateway-3.0.2
+    helm.sh/chart: gateway-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -743,7 +743,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: gateway
-    helm.sh/chart: gateway-3.0.2
+    helm.sh/chart: gateway-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -771,7 +771,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: gateway
-    helm.sh/chart: gateway-3.0.2
+    helm.sh/chart: gateway-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -800,7 +800,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -823,7 +823,7 @@ spec:
         traffic.sidecar.istio.io/includeInboundPorts: ""
       labels:
         app.kubernetes.io/name: controller
-        helm.sh/chart: controller-3.0.2
+        helm.sh/chart: controller-3.1.0
         app.kubernetes.io/instance: "chartsnap"
         app.kubernetes.io/managed-by: "Helm"
         app.kubernetes.io/version: "3.9"
@@ -962,7 +962,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: gateway
-    helm.sh/chart: gateway-3.0.2
+    helm.sh/chart: gateway-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -983,7 +983,7 @@ spec:
         traffic.sidecar.istio.io/includeInboundPorts: ""
       labels:
         app.kubernetes.io/name: gateway
-        helm.sh/chart: gateway-3.0.2
+        helm.sh/chart: gateway-3.1.0
         app.kubernetes.io/instance: "chartsnap"
         app.kubernetes.io/managed-by: "Helm"
         app.kubernetes.io/version: "3.9"
@@ -1219,7 +1219,7 @@ metadata:
   name: chartsnap-controller-default-validations
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1242,6 +1242,10 @@ webhooks:
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
@@ -1265,14 +1269,14 @@ webhooks:
   name: secrets.plugins.validation.ingress-controller.konghq.com
   objectSelector:
     matchExpressions:
-    - key: owner
-      operator: NotIn
-      values:
-      - helm
     - key: "konghq.com/credential"
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
diff --git a/charts/ingress/ci/__snapshots__/kic-3.4-values.snap b/charts/ingress/ci/__snapshots__/kic-3.4-values.snap
index bcea2838b..488757315 100644
--- a/charts/ingress/ci/__snapshots__/kic-3.4-values.snap
+++ b/charts/ingress/ci/__snapshots__/kic-3.4-values.snap
@@ -8,7 +8,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -21,7 +21,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: gateway
-    helm.sh/chart: gateway-3.0.2
+    helm.sh/chart: gateway-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -34,7 +34,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -51,7 +51,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -68,7 +68,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -85,7 +85,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -100,7 +100,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -550,7 +550,7 @@ metadata:
   name: chartsnap-controller
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -571,7 +571,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -641,7 +641,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -662,7 +662,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -674,7 +674,7 @@ spec:
     targetPort: webhook
   selector:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -688,7 +688,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -704,7 +704,7 @@ spec:
     targetPort: cstatus
   selector:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -718,7 +718,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: gateway
-    helm.sh/chart: gateway-3.0.2
+    helm.sh/chart: gateway-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -743,7 +743,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: gateway
-    helm.sh/chart: gateway-3.0.2
+    helm.sh/chart: gateway-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -771,7 +771,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: gateway
-    helm.sh/chart: gateway-3.0.2
+    helm.sh/chart: gateway-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -800,7 +800,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -823,7 +823,7 @@ spec:
         traffic.sidecar.istio.io/includeInboundPorts: ""
       labels:
         app.kubernetes.io/name: controller
-        helm.sh/chart: controller-3.0.2
+        helm.sh/chart: controller-3.1.0
         app.kubernetes.io/instance: "chartsnap"
         app.kubernetes.io/managed-by: "Helm"
         app.kubernetes.io/version: "3.9"
@@ -962,7 +962,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: gateway
-    helm.sh/chart: gateway-3.0.2
+    helm.sh/chart: gateway-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -983,7 +983,7 @@ spec:
         traffic.sidecar.istio.io/includeInboundPorts: ""
       labels:
         app.kubernetes.io/name: gateway
-        helm.sh/chart: gateway-3.0.2
+        helm.sh/chart: gateway-3.1.0
         app.kubernetes.io/instance: "chartsnap"
         app.kubernetes.io/managed-by: "Helm"
         app.kubernetes.io/version: "3.9"
@@ -1219,7 +1219,7 @@ metadata:
   name: chartsnap-controller-default-validations
   labels:
     app.kubernetes.io/name: controller
-    helm.sh/chart: controller-3.0.2
+    helm.sh/chart: controller-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1242,6 +1242,10 @@ webhooks:
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
@@ -1265,14 +1269,14 @@ webhooks:
   name: secrets.plugins.validation.ingress-controller.konghq.com
   objectSelector:
     matchExpressions:
-    - key: owner
-      operator: NotIn
-      values:
-      - helm
     - key: "konghq.com/credential"
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
diff --git a/charts/kong-operator/CHANGELOG.md b/charts/kong-operator/CHANGELOG.md
index 15f27c076..0360d8f68 100644
--- a/charts/kong-operator/CHANGELOG.md
+++ b/charts/kong-operator/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.2.2
+
+### Changed
+
+- Bump default version of the operator image to `2.1.2`
+  [#3394](https://github.com/Kong/kong-operator/pull/3394)
+
 ## 1.2.1
 
 ### Changed
diff --git a/charts/kong-operator/Chart.yaml b/charts/kong-operator/Chart.yaml
index 7fbb2abb8..a3ec389ef 100644
--- a/charts/kong-operator/Chart.yaml
+++ b/charts/kong-operator/Chart.yaml
@@ -8,8 +8,8 @@ maintainers:
 name: kong-operator
 sources:
   - https://github.com/Kong/kong-operator/charts/kong-operator/
-version: 1.2.1
-appVersion: "2.1.1"
+version: 1.2.2
+appVersion: "2.1.2"
 annotations:
   artifacthub.io/category: networking
   artifacthub.io/prerelease: "false"
diff --git a/charts/kong-operator/charts/ko-crds/templates/ko-crds.yaml b/charts/kong-operator/charts/ko-crds/templates/ko-crds.yaml
index fa2370e21..2bbf1d0b7 100644
--- a/charts/kong-operator/charts/ko-crds/templates/ko-crds.yaml
+++ b/charts/kong-operator/charts/ko-crds/templates/ko-crds.yaml
@@ -51,7 +51,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -594,7 +594,7 @@ metadata:
 {{ end }}
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
 {{ if .Values.global.webhooks.conversion.enabled }}
@@ -10027,7 +10027,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -10180,7 +10180,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -20183,7 +20183,7 @@ metadata:
 {{ end }}
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
 {{ if .Values.global.webhooks.conversion.enabled }}
@@ -49042,7 +49042,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49103,7 +49103,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49453,7 +49453,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49859,7 +49859,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50169,7 +50169,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50477,7 +50477,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50814,7 +50814,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51072,7 +51072,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51330,7 +51330,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51592,7 +51592,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51856,7 +51856,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52144,7 +52144,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52338,7 +52338,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52637,7 +52637,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53018,7 +53018,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53322,7 +53322,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53523,7 +53523,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53997,7 +53997,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -54182,7 +54182,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -54486,7 +54486,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -54660,7 +54660,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -55146,7 +55146,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -55512,7 +55512,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -55769,7 +55769,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -56032,7 +56032,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -56790,7 +56790,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -57323,7 +57323,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -57671,7 +57671,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -57881,7 +57881,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -58407,7 +58407,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -58716,7 +58716,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -59181,7 +59181,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -59995,7 +59995,7 @@ metadata:
 {{ end }}
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
 {{ if .Values.global.webhooks.conversion.enabled }}
@@ -60345,12 +60345,14 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status
-            == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c,
+            c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef
+            == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid
             API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status
-            == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c,
+            c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef
+            == oldSelf.spec.konnect.authRef'
     served: true
     storage: false
     subresources:
@@ -60713,12 +60715,14 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status
-            == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c,
+            c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef
+            == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid
             API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status
-            == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c,
+            c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef
+            == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -60732,7 +60736,7 @@ metadata:
     helm.sh/resource-policy: keep
 {{ end }}
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
diff --git a/charts/kong-operator/ci/__snapshots__/affinity-values.snap b/charts/kong-operator/ci/__snapshots__/affinity-values.snap
index 22911b32b..f8b746898 100644
--- a/charts/kong-operator/ci/__snapshots__/affinity-values.snap
+++ b/charts/kong-operator/ci/__snapshots__/affinity-values.snap
@@ -55,9 +55,9 @@ kind: Secret
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   annotations:
     dnsNames: "chartsnap-kong-operator-webhook.default.svc,chartsnap-kong-operator-webhook.default.svc.cluster.local"
@@ -79,7 +79,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -611,7 +611,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
   conversion:
@@ -9543,7 +9543,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -9693,7 +9693,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -19146,7 +19146,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
   conversion:
@@ -46162,7 +46162,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46221,7 +46221,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46553,7 +46553,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46937,7 +46937,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47238,7 +47238,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47530,7 +47530,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47851,7 +47851,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48097,7 +48097,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48343,7 +48343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48593,7 +48593,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48845,7 +48845,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49119,7 +49119,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49307,7 +49307,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49587,7 +49587,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49948,7 +49948,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50235,7 +50235,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50429,7 +50429,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50869,7 +50869,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -51049,7 +51049,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51343,7 +51343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51503,7 +51503,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51924,7 +51924,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52262,7 +52262,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52506,7 +52506,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52756,7 +52756,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -53446,7 +53446,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53927,7 +53927,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -54257,7 +54257,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54454,7 +54454,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54940,7 +54940,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55223,7 +55223,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55654,7 +55654,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -56401,7 +56401,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
   conversion:
@@ -56717,9 +56717,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: false
     subresources:
@@ -57036,9 +57036,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -57051,7 +57051,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -57847,9 +57847,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
   namespace: default
@@ -57875,12 +57875,12 @@ spec:
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: kong-operator
-        helm.sh/chart: kong-operator-1.2.1
+        helm.sh/chart: kong-operator-1.2.2
         app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "2.1.1"
+        app.kubernetes.io/version: "2.1.2"
         app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
-        version: "2.1.1"
+        version: "2.1.2"
     spec:
       affinity:
         podAffinity:
@@ -57915,7 +57915,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: docker.io/kong/kong-operator:2.1.1
+        image: docker.io/kong/kong-operator:2.1.2
         livenessProbe:
           httpGet:
             path: /healthz
@@ -57992,9 +57992,9 @@ kind: ValidatingWebhookConfiguration
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: controlplane-configuration-validations
 webhooks:
diff --git a/charts/kong-operator/ci/__snapshots__/controlplane-config-dump.snap b/charts/kong-operator/ci/__snapshots__/controlplane-config-dump.snap
index fa6df1899..4b622189f 100644
--- a/charts/kong-operator/ci/__snapshots__/controlplane-config-dump.snap
+++ b/charts/kong-operator/ci/__snapshots__/controlplane-config-dump.snap
@@ -55,9 +55,9 @@ kind: Secret
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   annotations:
     dnsNames: "chartsnap-kong-operator-webhook.default.svc,chartsnap-kong-operator-webhook.default.svc.cluster.local"
@@ -79,7 +79,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -611,7 +611,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
   conversion:
@@ -9543,7 +9543,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -9693,7 +9693,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -19146,7 +19146,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
   conversion:
@@ -46162,7 +46162,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46221,7 +46221,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46553,7 +46553,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46937,7 +46937,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47238,7 +47238,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47530,7 +47530,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47851,7 +47851,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48097,7 +48097,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48343,7 +48343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48593,7 +48593,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48845,7 +48845,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49119,7 +49119,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49307,7 +49307,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49587,7 +49587,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49948,7 +49948,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50235,7 +50235,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50429,7 +50429,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50869,7 +50869,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -51049,7 +51049,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51343,7 +51343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51503,7 +51503,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51924,7 +51924,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52262,7 +52262,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52506,7 +52506,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52756,7 +52756,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -53446,7 +53446,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53927,7 +53927,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -54257,7 +54257,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54454,7 +54454,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54940,7 +54940,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55223,7 +55223,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55654,7 +55654,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -56401,7 +56401,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
   conversion:
@@ -56717,9 +56717,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: false
     subresources:
@@ -57036,9 +57036,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -57051,7 +57051,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -57864,9 +57864,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
   namespace: default
@@ -57892,12 +57892,12 @@ spec:
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: kong-operator
-        helm.sh/chart: kong-operator-1.2.1
+        helm.sh/chart: kong-operator-1.2.2
         app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "2.1.1"
+        app.kubernetes.io/version: "2.1.2"
         app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
-        version: "2.1.1"
+        version: "2.1.2"
     spec:
       containers:
       - name: manager
@@ -57928,7 +57928,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: docker.io/kong/kong-operator:2.1.1
+        image: docker.io/kong/kong-operator:2.1.2
         livenessProbe:
           httpGet:
             path: /healthz
@@ -58005,9 +58005,9 @@ kind: ValidatingWebhookConfiguration
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: controlplane-configuration-validations
 webhooks:
diff --git a/charts/kong-operator/ci/__snapshots__/disable-gateway-controller-values.snap b/charts/kong-operator/ci/__snapshots__/disable-gateway-controller-values.snap
index 11b026d01..25630a230 100644
--- a/charts/kong-operator/ci/__snapshots__/disable-gateway-controller-values.snap
+++ b/charts/kong-operator/ci/__snapshots__/disable-gateway-controller-values.snap
@@ -55,9 +55,9 @@ kind: Secret
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   annotations:
     dnsNames: "chartsnap-kong-operator-webhook.default.svc,chartsnap-kong-operator-webhook.default.svc.cluster.local"
@@ -79,7 +79,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -611,7 +611,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
   conversion:
@@ -9543,7 +9543,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -9693,7 +9693,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -19146,7 +19146,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
   conversion:
@@ -46162,7 +46162,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46221,7 +46221,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46553,7 +46553,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46937,7 +46937,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47238,7 +47238,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47530,7 +47530,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47851,7 +47851,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48097,7 +48097,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48343,7 +48343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48593,7 +48593,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48845,7 +48845,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49119,7 +49119,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49307,7 +49307,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49587,7 +49587,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49948,7 +49948,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50235,7 +50235,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50429,7 +50429,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50869,7 +50869,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -51049,7 +51049,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51343,7 +51343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51503,7 +51503,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51924,7 +51924,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52262,7 +52262,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52506,7 +52506,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52756,7 +52756,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -53446,7 +53446,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53927,7 +53927,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -54257,7 +54257,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54454,7 +54454,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54940,7 +54940,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55223,7 +55223,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55654,7 +55654,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -56401,7 +56401,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
   conversion:
@@ -56717,9 +56717,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: false
     subresources:
@@ -57036,9 +57036,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -57051,7 +57051,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -57847,9 +57847,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
   namespace: default
@@ -57875,12 +57875,12 @@ spec:
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: kong-operator
-        helm.sh/chart: kong-operator-1.2.1
+        helm.sh/chart: kong-operator-1.2.2
         app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "2.1.1"
+        app.kubernetes.io/version: "2.1.2"
         app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
-        version: "2.1.1"
+        version: "2.1.2"
     spec:
       containers:
       - name: manager
@@ -57907,7 +57907,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: docker.io/kong/kong-operator:2.1.1
+        image: docker.io/kong/kong-operator:2.1.2
         livenessProbe:
           httpGet:
             path: /healthz
@@ -57984,9 +57984,9 @@ kind: ValidatingWebhookConfiguration
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: controlplane-configuration-validations
 webhooks:
diff --git a/charts/kong-operator/ci/__snapshots__/env-and-args-values.snap b/charts/kong-operator/ci/__snapshots__/env-and-args-values.snap
index bf79662eb..8fe19bd4d 100644
--- a/charts/kong-operator/ci/__snapshots__/env-and-args-values.snap
+++ b/charts/kong-operator/ci/__snapshots__/env-and-args-values.snap
@@ -55,9 +55,9 @@ kind: Secret
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   annotations:
     dnsNames: "chartsnap-kong-operator-webhook.default.svc,chartsnap-kong-operator-webhook.default.svc.cluster.local"
@@ -79,7 +79,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -611,7 +611,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
   conversion:
@@ -9543,7 +9543,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -9693,7 +9693,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -19146,7 +19146,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
   conversion:
@@ -46162,7 +46162,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46221,7 +46221,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46553,7 +46553,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46937,7 +46937,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47238,7 +47238,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47530,7 +47530,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47851,7 +47851,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48097,7 +48097,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48343,7 +48343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48593,7 +48593,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48845,7 +48845,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49119,7 +49119,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49307,7 +49307,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49587,7 +49587,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49948,7 +49948,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50235,7 +50235,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50429,7 +50429,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50869,7 +50869,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -51049,7 +51049,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51343,7 +51343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51503,7 +51503,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51924,7 +51924,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52262,7 +52262,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52506,7 +52506,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52756,7 +52756,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -53446,7 +53446,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53927,7 +53927,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -54257,7 +54257,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54454,7 +54454,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54940,7 +54940,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55223,7 +55223,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55654,7 +55654,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -56401,7 +56401,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
   conversion:
@@ -56717,9 +56717,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: false
     subresources:
@@ -57036,9 +57036,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -57051,7 +57051,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -57847,9 +57847,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
   namespace: default
@@ -57875,12 +57875,12 @@ spec:
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: kong-operator
-        helm.sh/chart: kong-operator-1.2.1
+        helm.sh/chart: kong-operator-1.2.2
         app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "2.1.1"
+        app.kubernetes.io/version: "2.1.2"
         app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
-        version: "2.1.1"
+        version: "2.1.2"
     spec:
       containers:
       - name: manager
@@ -57909,7 +57909,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: docker.io/kong/kong-operator:2.1.1
+        image: docker.io/kong/kong-operator:2.1.2
         livenessProbe:
           httpGet:
             path: /healthz
@@ -57986,9 +57986,9 @@ kind: ValidatingWebhookConfiguration
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: controlplane-configuration-validations
 webhooks:
diff --git a/charts/kong-operator/ci/__snapshots__/env-and-customenv-values.snap b/charts/kong-operator/ci/__snapshots__/env-and-customenv-values.snap
index 57bf3d816..330b0de2f 100644
--- a/charts/kong-operator/ci/__snapshots__/env-and-customenv-values.snap
+++ b/charts/kong-operator/ci/__snapshots__/env-and-customenv-values.snap
@@ -55,9 +55,9 @@ kind: Secret
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   annotations:
     dnsNames: "chartsnap-kong-operator-webhook.default.svc,chartsnap-kong-operator-webhook.default.svc.cluster.local"
@@ -79,7 +79,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -611,7 +611,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
   conversion:
@@ -9543,7 +9543,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -9693,7 +9693,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -19146,7 +19146,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
   conversion:
@@ -46162,7 +46162,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46221,7 +46221,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46553,7 +46553,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46937,7 +46937,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47238,7 +47238,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47530,7 +47530,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47851,7 +47851,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48097,7 +48097,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48343,7 +48343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48593,7 +48593,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48845,7 +48845,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49119,7 +49119,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49307,7 +49307,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49587,7 +49587,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49948,7 +49948,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50235,7 +50235,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50429,7 +50429,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50869,7 +50869,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -51049,7 +51049,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51343,7 +51343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51503,7 +51503,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51924,7 +51924,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52262,7 +52262,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52506,7 +52506,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52756,7 +52756,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -53446,7 +53446,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53927,7 +53927,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -54257,7 +54257,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54454,7 +54454,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54940,7 +54940,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55223,7 +55223,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55654,7 +55654,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -56401,7 +56401,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
   conversion:
@@ -56717,9 +56717,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: false
     subresources:
@@ -57036,9 +57036,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -57051,7 +57051,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -57847,9 +57847,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
   namespace: default
@@ -57875,12 +57875,12 @@ spec:
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: kong-operator
-        helm.sh/chart: kong-operator-1.2.1
+        helm.sh/chart: kong-operator-1.2.2
         app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "2.1.1"
+        app.kubernetes.io/version: "2.1.2"
         app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
-        version: "2.1.1"
+        version: "2.1.2"
     spec:
       containers:
       - name: manager
@@ -57909,7 +57909,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: docker.io/kong/kong-operator:2.1.1
+        image: docker.io/kong/kong-operator:2.1.2
         livenessProbe:
           httpGet:
             path: /healthz
@@ -57986,9 +57986,9 @@ kind: ValidatingWebhookConfiguration
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: controlplane-configuration-validations
 webhooks:
diff --git a/charts/kong-operator/ci/__snapshots__/extra-labels-values.snap b/charts/kong-operator/ci/__snapshots__/extra-labels-values.snap
index e22ae8384..4b2374f12 100644
--- a/charts/kong-operator/ci/__snapshots__/extra-labels-values.snap
+++ b/charts/kong-operator/ci/__snapshots__/extra-labels-values.snap
@@ -55,9 +55,9 @@ kind: Secret
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     a: "b"
     app.kubernetes.io/component: ko
   annotations:
@@ -80,7 +80,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -612,7 +612,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
   conversion:
@@ -9544,7 +9544,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -9694,7 +9694,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -19147,7 +19147,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
   conversion:
@@ -46163,7 +46163,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46222,7 +46222,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46554,7 +46554,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46938,7 +46938,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47239,7 +47239,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47531,7 +47531,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47852,7 +47852,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48098,7 +48098,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48344,7 +48344,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48594,7 +48594,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48846,7 +48846,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49120,7 +49120,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49308,7 +49308,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49588,7 +49588,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49949,7 +49949,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50236,7 +50236,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50430,7 +50430,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50870,7 +50870,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -51050,7 +51050,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51344,7 +51344,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51504,7 +51504,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51925,7 +51925,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52263,7 +52263,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52507,7 +52507,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52757,7 +52757,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -53447,7 +53447,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53928,7 +53928,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -54258,7 +54258,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54455,7 +54455,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54941,7 +54941,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55224,7 +55224,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55655,7 +55655,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -56402,7 +56402,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
   conversion:
@@ -56718,9 +56718,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: false
     subresources:
@@ -57037,9 +57037,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -57052,7 +57052,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -57848,9 +57848,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     a: "b"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
@@ -57877,13 +57877,13 @@ spec:
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: kong-operator
-        helm.sh/chart: kong-operator-1.2.1
+        helm.sh/chart: kong-operator-1.2.2
         app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "2.1.1"
+        app.kubernetes.io/version: "2.1.2"
         a: "b"
         app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
-        version: "2.1.1"
+        version: "2.1.2"
     spec:
       containers:
       - name: manager
@@ -57908,7 +57908,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: docker.io/kong/kong-operator:2.1.1
+        image: docker.io/kong/kong-operator:2.1.2
         livenessProbe:
           httpGet:
             path: /healthz
@@ -57985,9 +57985,9 @@ kind: ValidatingWebhookConfiguration
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     a: "b"
     app.kubernetes.io/component: ko
   name: controlplane-configuration-validations
diff --git a/charts/kong-operator/ci/__snapshots__/image-pull-secrets-and-image-digest-values.snap b/charts/kong-operator/ci/__snapshots__/image-pull-secrets-and-image-digest-values.snap
index 29ca1ed04..836eb8ea1 100644
--- a/charts/kong-operator/ci/__snapshots__/image-pull-secrets-and-image-digest-values.snap
+++ b/charts/kong-operator/ci/__snapshots__/image-pull-secrets-and-image-digest-values.snap
@@ -55,9 +55,9 @@ kind: Secret
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   annotations:
     dnsNames: "chartsnap-kong-operator-webhook.default.svc,chartsnap-kong-operator-webhook.default.svc.cluster.local"
@@ -79,7 +79,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -611,7 +611,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
   conversion:
@@ -9543,7 +9543,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -9693,7 +9693,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -19146,7 +19146,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
   conversion:
@@ -46162,7 +46162,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46221,7 +46221,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46553,7 +46553,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46937,7 +46937,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47238,7 +47238,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47530,7 +47530,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47851,7 +47851,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48097,7 +48097,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48343,7 +48343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48593,7 +48593,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48845,7 +48845,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49119,7 +49119,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49307,7 +49307,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49587,7 +49587,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49948,7 +49948,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50235,7 +50235,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50429,7 +50429,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50869,7 +50869,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -51049,7 +51049,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51343,7 +51343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51503,7 +51503,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51924,7 +51924,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52262,7 +52262,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52506,7 +52506,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52756,7 +52756,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -53446,7 +53446,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53927,7 +53927,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -54257,7 +54257,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54454,7 +54454,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54940,7 +54940,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55223,7 +55223,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55654,7 +55654,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -56401,7 +56401,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
   conversion:
@@ -56717,9 +56717,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: false
     subresources:
@@ -57036,9 +57036,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -57051,7 +57051,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -57847,9 +57847,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
   namespace: default
@@ -57875,12 +57875,12 @@ spec:
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: kong-operator
-        helm.sh/chart: kong-operator-1.2.1
+        helm.sh/chart: kong-operator-1.2.2
         app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "2.1.1"
+        app.kubernetes.io/version: "2.1.2"
         app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
-        version: "2.1.1"
+        version: "2.1.2"
     spec:
       imagePullSecrets:
       - name: myRegistryKeySecretName
@@ -57984,9 +57984,9 @@ kind: ValidatingWebhookConfiguration
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: controlplane-configuration-validations
 webhooks:
diff --git a/charts/kong-operator/ci/__snapshots__/nightly-can-be-used-values.snap b/charts/kong-operator/ci/__snapshots__/nightly-can-be-used-values.snap
index edb667cec..a6e15ea4f 100644
--- a/charts/kong-operator/ci/__snapshots__/nightly-can-be-used-values.snap
+++ b/charts/kong-operator/ci/__snapshots__/nightly-can-be-used-values.snap
@@ -55,9 +55,9 @@ kind: Secret
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   annotations:
     dnsNames: "chartsnap-kong-operator-webhook.default.svc,chartsnap-kong-operator-webhook.default.svc.cluster.local"
@@ -79,7 +79,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -611,7 +611,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
   conversion:
@@ -9543,7 +9543,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -9693,7 +9693,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -19146,7 +19146,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
   conversion:
@@ -46162,7 +46162,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46221,7 +46221,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46553,7 +46553,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46937,7 +46937,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47238,7 +47238,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47530,7 +47530,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47851,7 +47851,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48097,7 +48097,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48343,7 +48343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48593,7 +48593,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48845,7 +48845,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49119,7 +49119,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49307,7 +49307,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49587,7 +49587,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49948,7 +49948,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50235,7 +50235,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50429,7 +50429,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50869,7 +50869,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -51049,7 +51049,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51343,7 +51343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51503,7 +51503,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51924,7 +51924,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52262,7 +52262,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52506,7 +52506,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52756,7 +52756,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -53446,7 +53446,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53927,7 +53927,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -54257,7 +54257,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54454,7 +54454,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54940,7 +54940,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55223,7 +55223,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55654,7 +55654,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -56401,7 +56401,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
   conversion:
@@ -56717,9 +56717,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: false
     subresources:
@@ -57036,9 +57036,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -57051,7 +57051,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -57847,9 +57847,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
   namespace: default
@@ -57875,12 +57875,12 @@ spec:
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: kong-operator
-        helm.sh/chart: kong-operator-1.2.1
+        helm.sh/chart: kong-operator-1.2.2
         app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "2.1.1"
+        app.kubernetes.io/version: "2.1.2"
         app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
-        version: "2.1.1"
+        version: "2.1.2"
     spec:
       containers:
       - name: manager
@@ -57982,9 +57982,9 @@ kind: ValidatingWebhookConfiguration
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: controlplane-configuration-validations
 webhooks:
diff --git a/charts/kong-operator/ci/__snapshots__/pod-annotations-values.snap b/charts/kong-operator/ci/__snapshots__/pod-annotations-values.snap
index 643484c85..eed3064ed 100644
--- a/charts/kong-operator/ci/__snapshots__/pod-annotations-values.snap
+++ b/charts/kong-operator/ci/__snapshots__/pod-annotations-values.snap
@@ -55,9 +55,9 @@ kind: Secret
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   annotations:
     dnsNames: "chartsnap-kong-operator-webhook.default.svc,chartsnap-kong-operator-webhook.default.svc.cluster.local"
@@ -79,7 +79,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -611,7 +611,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
   conversion:
@@ -9543,7 +9543,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -9693,7 +9693,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -19146,7 +19146,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
   conversion:
@@ -46162,7 +46162,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46221,7 +46221,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46553,7 +46553,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46937,7 +46937,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47238,7 +47238,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47530,7 +47530,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47851,7 +47851,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48097,7 +48097,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48343,7 +48343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48593,7 +48593,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48845,7 +48845,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49119,7 +49119,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49307,7 +49307,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49587,7 +49587,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49948,7 +49948,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50235,7 +50235,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50429,7 +50429,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50869,7 +50869,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -51049,7 +51049,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51343,7 +51343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51503,7 +51503,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51924,7 +51924,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52262,7 +52262,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52506,7 +52506,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52756,7 +52756,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -53446,7 +53446,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53927,7 +53927,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -54257,7 +54257,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54454,7 +54454,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54940,7 +54940,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55223,7 +55223,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55654,7 +55654,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -56401,7 +56401,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
   conversion:
@@ -56717,9 +56717,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: false
     subresources:
@@ -57036,9 +57036,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -57051,7 +57051,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -57847,9 +57847,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
   namespace: default
@@ -57876,12 +57876,12 @@ spec:
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: kong-operator
-        helm.sh/chart: kong-operator-1.2.1
+        helm.sh/chart: kong-operator-1.2.2
         app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "2.1.1"
+        app.kubernetes.io/version: "2.1.2"
         app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
-        version: "2.1.1"
+        version: "2.1.2"
     spec:
       containers:
       - name: manager
@@ -57906,7 +57906,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: docker.io/kong/kong-operator:2.1.1
+        image: docker.io/kong/kong-operator:2.1.2
         livenessProbe:
           httpGet:
             path: /healthz
@@ -57983,9 +57983,9 @@ kind: ValidatingWebhookConfiguration
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: controlplane-configuration-validations
 webhooks:
diff --git a/charts/kong-operator/ci/__snapshots__/probes-and-args-values.snap b/charts/kong-operator/ci/__snapshots__/probes-and-args-values.snap
index 4d66f1d01..36c6700ef 100644
--- a/charts/kong-operator/ci/__snapshots__/probes-and-args-values.snap
+++ b/charts/kong-operator/ci/__snapshots__/probes-and-args-values.snap
@@ -55,9 +55,9 @@ kind: Secret
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   annotations:
     dnsNames: "chartsnap-kong-operator-webhook.default.svc,chartsnap-kong-operator-webhook.default.svc.cluster.local"
@@ -79,7 +79,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -611,7 +611,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
   conversion:
@@ -9543,7 +9543,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -9693,7 +9693,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -19146,7 +19146,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
   conversion:
@@ -46162,7 +46162,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46221,7 +46221,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46553,7 +46553,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46937,7 +46937,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47238,7 +47238,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47530,7 +47530,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47851,7 +47851,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48097,7 +48097,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48343,7 +48343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48593,7 +48593,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48845,7 +48845,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49119,7 +49119,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49307,7 +49307,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49587,7 +49587,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49948,7 +49948,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50235,7 +50235,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50429,7 +50429,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50869,7 +50869,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -51049,7 +51049,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51343,7 +51343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51503,7 +51503,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51924,7 +51924,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52262,7 +52262,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52506,7 +52506,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52756,7 +52756,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -53446,7 +53446,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53927,7 +53927,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -54257,7 +54257,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54454,7 +54454,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54940,7 +54940,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55223,7 +55223,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55654,7 +55654,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -56401,7 +56401,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
   conversion:
@@ -56717,9 +56717,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: false
     subresources:
@@ -57036,9 +57036,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -57051,7 +57051,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -57847,9 +57847,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
   namespace: default
@@ -57875,12 +57875,12 @@ spec:
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: kong-operator
-        helm.sh/chart: kong-operator-1.2.1
+        helm.sh/chart: kong-operator-1.2.2
         app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "2.1.1"
+        app.kubernetes.io/version: "2.1.2"
         app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
-        version: "2.1.1"
+        version: "2.1.2"
     spec:
       containers:
       - name: manager
@@ -57907,7 +57907,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: docker.io/kong/kong-operator:2.1.1
+        image: docker.io/kong/kong-operator:2.1.2
         livenessProbe:
           httpGet:
             path: /healthz
@@ -57984,9 +57984,9 @@ kind: ValidatingWebhookConfiguration
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: controlplane-configuration-validations
 webhooks:
diff --git a/charts/kong-operator/ci/__snapshots__/tolerations-values.snap b/charts/kong-operator/ci/__snapshots__/tolerations-values.snap
index fbb745ad6..d3cea819e 100644
--- a/charts/kong-operator/ci/__snapshots__/tolerations-values.snap
+++ b/charts/kong-operator/ci/__snapshots__/tolerations-values.snap
@@ -55,9 +55,9 @@ kind: Secret
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   annotations:
     dnsNames: "chartsnap-kong-operator-webhook.default.svc,chartsnap-kong-operator-webhook.default.svc.cluster.local"
@@ -79,7 +79,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -611,7 +611,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
   conversion:
@@ -9543,7 +9543,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -9693,7 +9693,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -19146,7 +19146,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
   conversion:
@@ -46162,7 +46162,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46221,7 +46221,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46553,7 +46553,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46937,7 +46937,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47238,7 +47238,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47530,7 +47530,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47851,7 +47851,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48097,7 +48097,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48343,7 +48343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48593,7 +48593,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48845,7 +48845,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49119,7 +49119,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49307,7 +49307,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49587,7 +49587,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49948,7 +49948,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50235,7 +50235,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50429,7 +50429,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50869,7 +50869,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -51049,7 +51049,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51343,7 +51343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51503,7 +51503,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51924,7 +51924,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52262,7 +52262,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52506,7 +52506,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52756,7 +52756,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -53446,7 +53446,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53927,7 +53927,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -54257,7 +54257,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54454,7 +54454,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54940,7 +54940,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55223,7 +55223,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55654,7 +55654,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -56401,7 +56401,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
   conversion:
@@ -56717,9 +56717,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: false
     subresources:
@@ -57036,9 +57036,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -57051,7 +57051,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -57847,9 +57847,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
   namespace: default
@@ -57875,12 +57875,12 @@ spec:
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: kong-operator
-        helm.sh/chart: kong-operator-1.2.1
+        helm.sh/chart: kong-operator-1.2.2
         app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "2.1.1"
+        app.kubernetes.io/version: "2.1.2"
         app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
-        version: "2.1.1"
+        version: "2.1.2"
     spec:
       tolerations:
       - effect: NoSchedule
@@ -57909,7 +57909,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: docker.io/kong/kong-operator:2.1.1
+        image: docker.io/kong/kong-operator:2.1.2
         livenessProbe:
           httpGet:
             path: /healthz
@@ -57986,9 +57986,9 @@ kind: ValidatingWebhookConfiguration
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: controlplane-configuration-validations
 webhooks:
diff --git a/charts/kong-operator/ci/__snapshots__/validating-policies-dataplane-ports-disabled.snap b/charts/kong-operator/ci/__snapshots__/validating-policies-dataplane-ports-disabled.snap
index ff083ed3b..550f88e91 100644
--- a/charts/kong-operator/ci/__snapshots__/validating-policies-dataplane-ports-disabled.snap
+++ b/charts/kong-operator/ci/__snapshots__/validating-policies-dataplane-ports-disabled.snap
@@ -55,9 +55,9 @@ kind: Secret
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   annotations:
     dnsNames: "chartsnap-kong-operator-webhook.default.svc,chartsnap-kong-operator-webhook.default.svc.cluster.local"
@@ -79,7 +79,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -611,7 +611,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
   conversion:
@@ -9543,7 +9543,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -9693,7 +9693,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -19146,7 +19146,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
   conversion:
@@ -46162,7 +46162,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46221,7 +46221,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46553,7 +46553,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46937,7 +46937,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47238,7 +47238,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47530,7 +47530,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47851,7 +47851,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48097,7 +48097,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48343,7 +48343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48593,7 +48593,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48845,7 +48845,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49119,7 +49119,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49307,7 +49307,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49587,7 +49587,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49948,7 +49948,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50235,7 +50235,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50429,7 +50429,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50869,7 +50869,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -51049,7 +51049,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51343,7 +51343,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51503,7 +51503,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51924,7 +51924,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52262,7 +52262,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52506,7 +52506,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52756,7 +52756,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -53446,7 +53446,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53927,7 +53927,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -54257,7 +54257,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54454,7 +54454,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54940,7 +54940,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55223,7 +55223,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55654,7 +55654,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -56401,7 +56401,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
   conversion:
@@ -56717,9 +56717,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: false
     subresources:
@@ -57036,9 +57036,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -57051,7 +57051,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -57847,9 +57847,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
   namespace: default
@@ -57875,12 +57875,12 @@ spec:
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: kong-operator
-        helm.sh/chart: kong-operator-1.2.1
+        helm.sh/chart: kong-operator-1.2.2
         app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "2.1.1"
+        app.kubernetes.io/version: "2.1.2"
         app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
-        version: "2.1.1"
+        version: "2.1.2"
     spec:
       containers:
       - name: manager
@@ -57905,7 +57905,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: docker.io/kong/kong-operator:2.1.1
+        image: docker.io/kong/kong-operator:2.1.2
         livenessProbe:
           httpGet:
             path: /healthz
@@ -57982,9 +57982,9 @@ kind: ValidatingWebhookConfiguration
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: controlplane-configuration-validations
 webhooks:
diff --git a/charts/kong-operator/ci/__snapshots__/webhook-conversion-disabled-values.snap b/charts/kong-operator/ci/__snapshots__/webhook-conversion-disabled-values.snap
index 612b7a8b8..7132448f5 100644
--- a/charts/kong-operator/ci/__snapshots__/webhook-conversion-disabled-values.snap
+++ b/charts/kong-operator/ci/__snapshots__/webhook-conversion-disabled-values.snap
@@ -30,9 +30,9 @@ kind: Secret
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   annotations:
     dnsNames: "chartsnap-kong-operator-webhook.default.svc,chartsnap-kong-operator-webhook.default.svc.cluster.local"
@@ -54,7 +54,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -586,7 +586,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -1161,7 +1161,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -1311,7 +1311,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -10764,7 +10764,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -20329,7 +20329,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -20388,7 +20388,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -20720,7 +20720,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -21104,7 +21104,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -21405,7 +21405,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -21697,7 +21697,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -22018,7 +22018,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -22264,7 +22264,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -22510,7 +22510,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -22760,7 +22760,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -23012,7 +23012,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -23286,7 +23286,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -23474,7 +23474,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -23754,7 +23754,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -24115,7 +24115,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -24402,7 +24402,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -24596,7 +24596,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -25036,7 +25036,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -25216,7 +25216,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -25510,7 +25510,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -25670,7 +25670,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -26091,7 +26091,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -26429,7 +26429,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -26673,7 +26673,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -26923,7 +26923,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -27613,7 +27613,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -28094,7 +28094,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -28424,7 +28424,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -28621,7 +28621,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -29107,7 +29107,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -29390,7 +29390,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -29821,7 +29821,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -30200,7 +30200,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -30526,9 +30526,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -30545,7 +30545,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -31337,9 +31337,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
   namespace: default
@@ -31365,12 +31365,12 @@ spec:
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: kong-operator
-        helm.sh/chart: kong-operator-1.2.1
+        helm.sh/chart: kong-operator-1.2.2
         app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "2.1.1"
+        app.kubernetes.io/version: "2.1.2"
         app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
-        version: "2.1.1"
+        version: "2.1.2"
     spec:
       containers:
       - name: manager
@@ -31397,7 +31397,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: docker.io/kong/kong-operator:2.1.1
+        image: docker.io/kong/kong-operator:2.1.2
         livenessProbe:
           httpGet:
             path: /healthz
@@ -31464,9 +31464,9 @@ kind: ValidatingWebhookConfiguration
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: controlplane-configuration-validations
 webhooks:
diff --git a/charts/kong-operator/ci/__snapshots__/webhook-conversion-enabled-cert-manager.snap b/charts/kong-operator/ci/__snapshots__/webhook-conversion-enabled-cert-manager.snap
index 29d0f0ac6..b8fc42c4c 100644
--- a/charts/kong-operator/ci/__snapshots__/webhook-conversion-enabled-cert-manager.snap
+++ b/charts/kong-operator/ci/__snapshots__/webhook-conversion-enabled-cert-manager.snap
@@ -29,7 +29,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -562,7 +562,7 @@ metadata:
     helm.sh/resource-policy: keep
     cert-manager.io/inject-ca-from: default/chartsnap-kong-operator-webhook-serving-cert
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
   conversion:
@@ -9493,7 +9493,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -9643,7 +9643,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -19097,7 +19097,7 @@ metadata:
     helm.sh/resource-policy: keep
     cert-manager.io/inject-ca-from: default/chartsnap-kong-operator-webhook-serving-cert
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
   conversion:
@@ -46112,7 +46112,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46171,7 +46171,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46503,7 +46503,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -46887,7 +46887,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47188,7 +47188,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47480,7 +47480,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -47801,7 +47801,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48047,7 +48047,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48293,7 +48293,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48543,7 +48543,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -48795,7 +48795,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49069,7 +49069,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49257,7 +49257,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49537,7 +49537,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -49898,7 +49898,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50185,7 +50185,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50379,7 +50379,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -50819,7 +50819,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -50999,7 +50999,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51293,7 +51293,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51453,7 +51453,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -51874,7 +51874,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52212,7 +52212,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52456,7 +52456,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -52706,7 +52706,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -53396,7 +53396,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -53877,7 +53877,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -54207,7 +54207,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54404,7 +54404,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -54890,7 +54890,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55173,7 +55173,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -55604,7 +55604,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -56352,7 +56352,7 @@ metadata:
     helm.sh/resource-policy: keep
     cert-manager.io/inject-ca-from: default/chartsnap-kong-operator-webhook-serving-cert
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
   conversion:
@@ -56667,9 +56667,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: false
     subresources:
@@ -56986,9 +56986,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -57001,7 +57001,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -57797,9 +57797,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
   namespace: default
@@ -57825,12 +57825,12 @@ spec:
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: kong-operator
-        helm.sh/chart: kong-operator-1.2.1
+        helm.sh/chart: kong-operator-1.2.2
         app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "2.1.1"
+        app.kubernetes.io/version: "2.1.2"
         app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
-        version: "2.1.1"
+        version: "2.1.2"
     spec:
       containers:
       - name: manager
@@ -57855,7 +57855,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: docker.io/kong/kong-operator:2.1.1
+        image: docker.io/kong/kong-operator:2.1.2
         livenessProbe:
           httpGet:
             path: /healthz
@@ -57935,9 +57935,9 @@ metadata:
     cert-manager.io/secret-template: '{ "labels": { "konghq.com/secret" : "internal" } }'
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: controlplane-configuration-validations
 webhooks:
@@ -58052,9 +58052,9 @@ kind: Certificate
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-webhook-serving-cert
   namespace: default
@@ -58073,9 +58073,9 @@ kind: Certificate
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-webhook-validating-serving-cert
   namespace: default
@@ -58094,9 +58094,9 @@ kind: Issuer
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-webhook-selfsigned-issuer
   namespace: default
diff --git a/charts/kong-operator/ci/__snapshots__/webhooks-validating-and-conversion-disabled-values.snap b/charts/kong-operator/ci/__snapshots__/webhooks-validating-and-conversion-disabled-values.snap
index 7cbb382ee..3b4c63e9e 100644
--- a/charts/kong-operator/ci/__snapshots__/webhooks-validating-and-conversion-disabled-values.snap
+++ b/charts/kong-operator/ci/__snapshots__/webhooks-validating-and-conversion-disabled-values.snap
@@ -29,7 +29,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: aigateways.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -561,7 +561,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: controlplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -1136,7 +1136,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanemetricsextensions.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -1286,7 +1286,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: dataplanes.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -10739,7 +10739,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: gatewayconfigurations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -20304,7 +20304,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: ingressclassparameterses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -20363,7 +20363,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcacertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -20695,7 +20695,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -21079,7 +21079,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -21380,7 +21380,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumergroups.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -21672,7 +21672,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -21993,7 +21993,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialacls.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -22239,7 +22239,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialapikeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -22485,7 +22485,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialbasicauths.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -22735,7 +22735,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialhmacs.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -22987,7 +22987,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcredentialjwts.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -23261,7 +23261,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongcustomentities.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -23449,7 +23449,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongdataplaneclientcertificates.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -23729,7 +23729,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeys.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -24090,7 +24090,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongkeysets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -24377,7 +24377,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konglicenses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -24571,7 +24571,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongpluginbindings.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -25011,7 +25011,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugininstallations.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -25191,7 +25191,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -25485,7 +25485,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongreferencegrants.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -25645,7 +25645,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongroutes.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -26066,7 +26066,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongservices.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -26404,7 +26404,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongsnis.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -26648,7 +26648,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongtargets.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -26898,7 +26898,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   labels:
     gateway.networking.k8s.io/policy: direct
   name: kongupstreampolicies.configuration.konghq.com
@@ -27588,7 +27588,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongupstreams.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -28069,7 +28069,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: kongvaults.configuration.konghq.com
 spec:
   group: configuration.konghq.com
@@ -28399,7 +28399,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectapiauthconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -28596,7 +28596,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaydataplanegroupconfigurations.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -29082,7 +29082,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaynetworks.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -29365,7 +29365,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectcloudgatewaytransitgateways.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -29796,7 +29796,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectextensions.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -30175,7 +30175,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: konnectgatewaycontrolplanes.konnect.konghq.com
 spec:
   group: konnect.konghq.com
@@ -30501,9 +30501,9 @@ spec:
         type: object
         x-kubernetes-validations:
         - message: spec.konnect.authRef is immutable when an entity is already Programmed
-          rule: '!self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''Programmed'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
         - message: spec.konnect.authRef is immutable when an entity refers to a Valid API Auth Configuration
-          rule: '!self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'') ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
+          rule: '(!has(self.status) || !has(self.status.conditions) || !self.status.conditions.exists(c, c.type == ''APIAuthValid'' && c.status == ''True'')) ? true : self.spec.konnect.authRef == oldSelf.spec.konnect.authRef'
     served: true
     storage: true
     subresources:
@@ -30520,7 +30520,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     kubernetes-configuration.konghq.com/channels: kong-operator
-    kubernetes-configuration.konghq.com/version: v2.1.1
+    kubernetes-configuration.konghq.com/version: v2.1.2
   name: watchnamespacegrants.gateway-operator.konghq.com
 spec:
   group: gateway-operator.konghq.com
@@ -31295,9 +31295,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kong-operator
-    helm.sh/chart: kong-operator-1.2.1
+    helm.sh/chart: kong-operator-1.2.2
     app.kubernetes.io/instance: "chartsnap"
-    app.kubernetes.io/version: "2.1.1"
+    app.kubernetes.io/version: "2.1.2"
     app.kubernetes.io/component: ko
   name: chartsnap-kong-operator-controller-manager
   namespace: default
@@ -31323,12 +31323,12 @@ spec:
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: kong-operator
-        helm.sh/chart: kong-operator-1.2.1
+        helm.sh/chart: kong-operator-1.2.2
         app.kubernetes.io/instance: "chartsnap"
-        app.kubernetes.io/version: "2.1.1"
+        app.kubernetes.io/version: "2.1.2"
         app.kubernetes.io/component: ko
         app: chartsnap-kong-operator
-        version: "2.1.1"
+        version: "2.1.2"
     spec:
       containers:
       - name: manager
@@ -31357,7 +31357,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: docker.io/kong/kong-operator:2.1.1
+        image: docker.io/kong/kong-operator:2.1.2
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/charts/kong-operator/values.yaml b/charts/kong-operator/values.yaml
index 8d1ba1ec8..301cf06d9 100644
--- a/charts/kong-operator/values.yaml
+++ b/charts/kong-operator/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: docker.io/kong/kong-operator
-  tag: "2.1.1"
+  tag: "2.1.2"
   # If you want only the digest to be used, set tag to "" in your values.yaml.
   digest: ""
   # Optionally set a semantic version for version-gated features. This can normally
diff --git a/charts/kong/CHANGELOG.md b/charts/kong/CHANGELOG.md
index c98b4575e..c1d632d6c 100644
--- a/charts/kong/CHANGELOG.md
+++ b/charts/kong/CHANGELOG.md
@@ -1,9 +1,25 @@
 # Changelog
 
+## 3.1.0
+
+### Changes
+
+* Applied `objectSelector` to all admission webhook configurations, not just
+  the `validations.kong.konghq.com` webhook. This ensures consistent filtering
+  across all webhook entries.
+  [#1497](https://github.com/Kong/charts/pull/1497)
+
 ## 3.0.2
 
 ### Added
 
+* Added `additionalProxies` configuration to support multiple proxy services.
+  This allows creating additional Kubernetes Services (e.g., ClusterIP for
+  internal access) alongside the primary proxy service (e.g., LoadBalancer with
+  proxy_protocol for external access). Each additional proxy automatically
+  registers its listeners in `KONG_PROXY_LISTEN` and `KONG_PORT_MAPS`, and
+  exposes the corresponding container ports in the deployment.
+
 * Added `containerSecurityContext.enabled` option to allow disabling the
   container security context for OpenShift compatibility.
   [#1456](https://github.com/Kong/charts/pull/1456)
diff --git a/charts/kong/Chart.yaml b/charts/kong/Chart.yaml
index 84d7d6719..25b53a821 100644
--- a/charts/kong/Chart.yaml
+++ b/charts/kong/Chart.yaml
@@ -8,7 +8,7 @@ maintainers:
 name: kong
 sources:
   - https://github.com/Kong/charts/tree/main/charts/kong
-version: 3.0.2
+version: 3.1.0
 appVersion: "3.9"
 dependencies:
   - name: postgresql
diff --git a/charts/kong/README.md b/charts/kong/README.md
index 52232c348..5cf7ca8ad 100644
--- a/charts/kong/README.md
+++ b/charts/kong/README.md
@@ -58,6 +58,7 @@ helm install kong/kong --generate-name
     - [Kong Service Parameters](#kong-service-parameters)
     - [Admin Service mTLS](#admin-service-mtls)
     - [Stream listens](#stream-listens)
+    - [Additional Proxy Services](#additional-proxy-services)
   - [Ingress Controller Parameters](#ingress-controller-parameters)
     - [The `env` section](#the-env-section)
     - [The `customEnv` section](#the-customenv-section)
@@ -763,6 +764,84 @@ are configured using an array of objects under `proxy.stream` and `udpProxy.stre
 | hostPort                           | Host port to use for a stream listen                                                  |                     |
 | parameters                         | Array of additional listen parameters                                                 | `[]`                |
 
+#### Additional Proxy Services
+
+The `additionalProxies` map allows you to create additional Kubernetes
+Services that route to the same Kong proxy container. This is useful when
+you need Kong proxy accessible through multiple distinct network paths with
+different configurations.
+
+A common use case is exposing Kong through both an external LoadBalancer
+(e.g. AWS NLB with `proxy_protocol`) and an internal ClusterIP service
+(without `proxy_protocol`) simultaneously, from a single Helm release.
+
+Each entry in the map creates a separate Service (and optionally an
+Ingress) and automatically registers its listeners in `KONG_PROXY_LISTEN`
+and `KONG_PORT_MAPS`, and exposes the corresponding container ports in
+the deployment.
+
+**Important:** Use container ports that do not conflict with the primary
+proxy ports (8000/8443) or any other Kong listener ports.
+
+The keys under each named entry follow the same `SVC.*` pattern described
+in [Kong Service Parameters](#kong-service-parameters) (`http`, `tls`,
+`stream`, `type`, `annotations`, `labels`, `ingress`, etc.).
+
+Example values:
+
+```yaml
+# Primary proxy -- external LB with proxy_protocol
+proxy:
+  enabled: true
+  type: LoadBalancer
+  annotations:
+    service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
+  http:
+    enabled: true
+    servicePort: 80
+    containerPort: 8000
+    parameters:
+    - proxy_protocol
+  tls:
+    enabled: true
+    servicePort: 443
+    containerPort: 8443
+    parameters:
+    - http2
+    - proxy_protocol
+
+# Additional internal proxy -- ClusterIP, no proxy_protocol
+additionalProxies:
+  internal:
+    enabled: true
+    type: ClusterIP
+    annotations: {}
+    labels:
+      proxy-type: "internal"
+    http:
+      enabled: true
+      servicePort: 80
+      containerPort: 7000
+      parameters: []
+    tls:
+      enabled: true
+      servicePort: 443
+      containerPort: 7443
+      parameters:
+      - http2
+      appProtocol: ""
+    stream: []
+    ingress:
+      enabled: false
+```
+
+This produces two Services:
+- `<release>-kong-proxy` (LoadBalancer with proxy_protocol)
+- `<release>-kong-proxy-internal` (ClusterIP without proxy_protocol)
+
+And the resulting `KONG_PROXY_LISTEN` will include listeners for all
+configured ports across both the primary and additional proxies.
+
 ### Ingress Controller Parameters
 
 All of the following properties are nested under the `ingressController`
diff --git a/charts/kong/ci/__snapshots__/admin-api-service-clusterip-values.snap b/charts/kong/ci/__snapshots__/admin-api-service-clusterip-values.snap
index 846918bd6..87a017f6c 100644
--- a/charts/kong/ci/__snapshots__/admin-api-service-clusterip-values.snap
+++ b/charts/kong/ci/__snapshots__/admin-api-service-clusterip-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -28,7 +28,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-custom-dbless-config
   namespace: default
 ---
@@ -40,7 +40,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-admin
   namespace: default
 spec:
@@ -63,7 +63,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -91,7 +91,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -119,7 +119,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -144,7 +144,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
diff --git a/charts/kong/ci/__snapshots__/admission-webhook-configuration.snap b/charts/kong/ci/__snapshots__/admission-webhook-configuration.snap
index cb8e40345..8ab69707f 100644
--- a/charts/kong/ci/__snapshots__/admission-webhook-configuration.snap
+++ b/charts/kong/ci/__snapshots__/admission-webhook-configuration.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -21,7 +21,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-ca-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -50,7 +50,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 rules:
   - apiGroups:
@@ -498,7 +498,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -517,7 +517,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 rules:
@@ -581,7 +581,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 roleRef:
@@ -601,7 +601,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook
   namespace: default
 spec:
@@ -616,7 +616,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -626,7 +626,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-metrics
   namespace: default
 spec:
@@ -645,7 +645,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -655,7 +655,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -683,7 +683,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -711,7 +711,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -735,7 +735,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -1039,7 +1039,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default-validations
 webhooks:
   - admissionReviewVersions:
@@ -1060,6 +1060,16 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
+        - key: infra
+          operator: In
+          values:
+            - cloud
+      matchLabels:
+        app.kubernetes.io/instance: kong-test
     rules:
       - apiGroups:
           - ""
@@ -1090,6 +1100,16 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
+        - key: infra
+          operator: In
+          values:
+            - cloud
+      matchLabels:
+        app.kubernetes.io/instance: kong-test
     rules:
       - apiGroups:
           - ""
@@ -1129,6 +1149,8 @@ webhooks:
           operator: In
           values:
             - cloud
+      matchLabels:
+        app.kubernetes.io/instance: kong-test
     rules:
       - apiGroups:
           - configuration.konghq.com
diff --git a/charts/kong/ci/__snapshots__/admission-webhook-filtersecrets-false.snap b/charts/kong/ci/__snapshots__/admission-webhook-filtersecrets-false.snap
new file mode 100644
index 000000000..c651a1594
--- /dev/null
+++ b/charts/kong/ci/__snapshots__/admission-webhook-filtersecrets-false.snap
@@ -0,0 +1,1193 @@
+# chartsnap: snapshot_version=v3
+---
+# Source: kong/templates/service-account.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: chartsnap-kong
+  namespace: default
+  labels:
+    app.kubernetes.io/name: kong
+    helm.sh/chart: kong-3.1.0
+    app.kubernetes.io/instance: "chartsnap"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/version: "3.9"
+---
+# Source: kong/templates/admission-webhook.yaml
+apiVersion: v1
+kind: Secret
+metadata:
+  name: chartsnap-kong-validation-webhook-ca-keypair
+  namespace: default
+  labels:
+    app.kubernetes.io/name: kong
+    helm.sh/chart: kong-3.1.0
+    app.kubernetes.io/instance: "chartsnap"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/version: "3.9"
+type: kubernetes.io/tls
+data:
+  tls.crt: '###DYNAMIC_FIELD###'
+  tls.key: '###DYNAMIC_FIELD###'
+---
+# Source: kong/templates/admission-webhook.yaml
+apiVersion: v1
+kind: Secret
+metadata:
+  name: chartsnap-kong-validation-webhook-keypair
+  namespace: default
+  labels:
+    app.kubernetes.io/name: kong
+    helm.sh/chart: kong-3.1.0
+    app.kubernetes.io/instance: "chartsnap"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/version: "3.9"
+type: kubernetes.io/tls
+data:
+  tls.crt: '###DYNAMIC_FIELD###'
+  tls.key: '###DYNAMIC_FIELD###'
+---
+# Source: kong/templates/controller-rbac-resources.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/name: kong
+    helm.sh/chart: kong-3.1.0
+    app.kubernetes.io/instance: "chartsnap"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/version: "3.9"
+  name: chartsnap-kong
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - backendtlspolicies
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - backendtlspolicies/status
+  verbs:
+  - patch
+  - update
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongcustomentities
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongcustomentities/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongupstreampolicies
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongupstreampolicies/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongconsumergroups
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongconsumergroups/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - services
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - services/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - ingressclassparameterses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongconsumers
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongconsumers/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongingresses/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongplugins
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongplugins/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - tcpingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - tcpingresses/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - udpingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - udpingresses/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - gateways
+  verbs:
+  - get
+  - list
+  - update
+  - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - gateways/status
+  verbs:
+  - get
+  - update
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - httproutes
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - httproutes/status
+  verbs:
+  - get
+  - update
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - referencegrants
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - referencegrants/status
+  verbs:
+  - get
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - tcproutes
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - tcproutes/status
+  verbs:
+  - get
+  - update
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - tlsroutes
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - tlsroutes/status
+  verbs:
+  - get
+  - update
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - udproutes
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - udproutes/status
+  verbs:
+  - get
+  - update
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - grpcroutes
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - grpcroutes/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - discovery.k8s.io
+  resources:
+  - endpointslices
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - konglicenses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - konglicenses/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongvaults
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongvaults/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongclusterplugins
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - kongclusterplugins/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - apiextensions.k8s.io
+  resources:
+  - customresourcedefinitions
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - gatewayclasses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - gatewayclasses/status
+  verbs:
+  - get
+  - update
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingressclasses
+  verbs:
+  - get
+  - list
+  - watch
+---
+# Source: kong/templates/controller-rbac-resources.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: chartsnap-kong
+  labels:
+    app.kubernetes.io/name: kong
+    helm.sh/chart: kong-3.1.0
+    app.kubernetes.io/instance: "chartsnap"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/version: "3.9"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: chartsnap-kong
+subjects:
+- kind: ServiceAccount
+  name: chartsnap-kong
+  namespace: default
+---
+# Source: kong/templates/controller-rbac-resources.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: chartsnap-kong
+  namespace: default
+  labels:
+    app.kubernetes.io/name: kong
+    helm.sh/chart: kong-3.1.0
+    app.kubernetes.io/instance: "chartsnap"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/version: "3.9"
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  - pods
+  - secrets
+  - namespaces
+  verbs:
+  - get
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  resourceNames:
+  # Defaults to "<election-id>-<ingress-class>"
+  # Here: "<kong-ingress-controller-leader-nginx>-<nginx>"
+  # This has to be adapted if you change either parameter
+  # when launching the nginx-ingress-controller.
+  - "kong-ingress-controller-leader-kong-kong"
+  verbs:
+  - get
+  - update
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - create
+# Begin KIC 2.x leader permissions
+- apiGroups:
+  - ""
+  - coordination.k8s.io
+  resources:
+  - configmaps
+  - leases
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+- apiGroups:
+  - ""
+  resources:
+  - services
+  verbs:
+  - get
+---
+# Source: kong/templates/controller-rbac-resources.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: chartsnap-kong
+  namespace: default
+  labels:
+    app.kubernetes.io/name: kong
+    helm.sh/chart: kong-3.1.0
+    app.kubernetes.io/instance: "chartsnap"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/version: "3.9"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: chartsnap-kong
+subjects:
+- kind: ServiceAccount
+  name: chartsnap-kong
+  namespace: default
+---
+# Source: kong/templates/admission-webhook.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: chartsnap-kong-validation-webhook
+  namespace: default
+  labels:
+    app.kubernetes.io/name: kong
+    helm.sh/chart: kong-3.1.0
+    app.kubernetes.io/instance: "chartsnap"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/version: "3.9"
+spec:
+  ports:
+  - name: webhook
+    port: 443
+    protocol: TCP
+    targetPort: webhook
+  selector:
+    app.kubernetes.io/name: kong
+    helm.sh/chart: kong-3.1.0
+    app.kubernetes.io/instance: "chartsnap"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/version: "3.9"
+    app.kubernetes.io/component: app
+---
+# Source: kong/templates/controller-service-metrics.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: chartsnap-kong-metrics
+  namespace: default
+  labels:
+    app.kubernetes.io/name: kong
+    helm.sh/chart: kong-3.1.0
+    app.kubernetes.io/instance: "chartsnap"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/version: "3.9"
+spec:
+  ports:
+  - name: cmetrics
+    port: 10255
+    protocol: TCP
+    targetPort: cmetrics
+  - name: status
+    port: 10254
+    protocol: TCP
+    targetPort: cstatus
+  selector:
+    app.kubernetes.io/name: kong
+    helm.sh/chart: kong-3.1.0
+    app.kubernetes.io/instance: "chartsnap"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/version: "3.9"
+    app.kubernetes.io/component: app
+---
+# Source: kong/templates/service-kong-manager.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: chartsnap-kong-manager
+  namespace: default
+  labels:
+    app.kubernetes.io/name: kong
+    helm.sh/chart: kong-3.1.0
+    app.kubernetes.io/instance: "chartsnap"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/version: "3.9"
+spec:
+  type: NodePort
+  ports:
+  - name: kong-manager
+    port: 8002
+    targetPort: 8002
+    protocol: TCP
+  - name: kong-manager-tls
+    port: 8445
+    targetPort: 8445
+    protocol: TCP
+  selector:
+    app.kubernetes.io/name: kong
+    app.kubernetes.io/component: app
+    app.kubernetes.io/instance: "chartsnap"
+---
+# Source: kong/templates/service-kong-proxy.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: chartsnap-kong-proxy
+  namespace: default
+  labels:
+    app.kubernetes.io/name: kong
+    helm.sh/chart: kong-3.1.0
+    app.kubernetes.io/instance: "chartsnap"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/version: "3.9"
+    enable-metrics: "true"
+spec:
+  type: LoadBalancer
+  ports:
+  - name: kong-proxy
+    port: 80
+    targetPort: 8000
+    protocol: TCP
+  - name: kong-proxy-tls
+    port: 443
+    targetPort: 8443
+    protocol: TCP
+  selector:
+    app.kubernetes.io/name: kong
+    app.kubernetes.io/component: app
+    app.kubernetes.io/instance: "chartsnap"
+---
+# Source: kong/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: chartsnap-kong
+  namespace: default
+  labels:
+    app.kubernetes.io/name: kong
+    helm.sh/chart: kong-3.1.0
+    app.kubernetes.io/instance: "chartsnap"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/version: "3.9"
+    app.kubernetes.io/component: app
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: kong
+      app.kubernetes.io/component: app
+      app.kubernetes.io/instance: "chartsnap"
+  template:
+    metadata:
+      annotations:
+        kuma.io/service-account-token-volume: chartsnap-kong-token
+        kuma.io/gateway: "enabled"
+        traffic.sidecar.istio.io/includeInboundPorts: ""
+      labels:
+        app.kubernetes.io/name: kong
+        helm.sh/chart: kong-3.1.0
+        app.kubernetes.io/instance: "chartsnap"
+        app.kubernetes.io/managed-by: "Helm"
+        app.kubernetes.io/version: "3.9"
+        app.kubernetes.io/component: app
+        app: chartsnap-kong
+        version: "3.9"
+    spec:
+      serviceAccountName: chartsnap-kong
+      automountServiceAccountToken: false
+      initContainers:
+      - name: clear-stale-pid
+        image: kong:3.9
+        imagePullPolicy: IfNotPresent
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+          runAsGroup: 1000
+          runAsNonRoot: true
+          runAsUser: 1000
+          seccompProfile:
+            type: RuntimeDefault
+        resources: {}
+        command:
+        - "rm"
+        - "-vrf"
+        - "$KONG_PREFIX/pids"
+        env:
+        - name: KONG_ADMIN_ACCESS_LOG
+          value: "/dev/stdout"
+        - name: KONG_ADMIN_ERROR_LOG
+          value: "/dev/stderr"
+        - name: KONG_ADMIN_GUI_ACCESS_LOG
+          value: "/dev/stdout"
+        - name: KONG_ADMIN_GUI_ERROR_LOG
+          value: "/dev/stderr"
+        - name: KONG_ADMIN_LISTEN
+          value: "127.0.0.1:8444 http2 ssl, [::1]:8444 http2 ssl"
+        - name: KONG_CLUSTER_LISTEN
+          value: "off"
+        - name: KONG_DATABASE
+          value: "off"
+        - name: KONG_KIC
+          value: "on"
+        - name: KONG_LUA_PACKAGE_PATH
+          value: "/opt/?.lua;/opt/?/init.lua;;"
+        - name: KONG_NGINX_WORKER_PROCESSES
+          value: "2"
+        - name: KONG_PORTAL_API_ACCESS_LOG
+          value: "/dev/stdout"
+        - name: KONG_PORTAL_API_ERROR_LOG
+          value: "/dev/stderr"
+        - name: KONG_PORT_MAPS
+          value: "80:8000, 443:8443"
+        - name: KONG_PREFIX
+          value: "/kong_prefix/"
+        - name: KONG_PROXY_ACCESS_LOG
+          value: "/dev/stdout"
+        - name: KONG_PROXY_ERROR_LOG
+          value: "/dev/stderr"
+        - name: KONG_PROXY_LISTEN
+          value: "0.0.0.0:8000, [::]:8000, 0.0.0.0:8443 http2 ssl, [::]:8443 http2 ssl"
+        - name: KONG_PROXY_STREAM_ACCESS_LOG
+          value: "/dev/stdout basic"
+        - name: KONG_PROXY_STREAM_ERROR_LOG
+          value: "/dev/stderr"
+        - name: KONG_ROUTER_FLAVOR
+          value: "traditional"
+        - name: KONG_STATUS_ACCESS_LOG
+          value: "off"
+        - name: KONG_STATUS_ERROR_LOG
+          value: "/dev/stderr"
+        - name: KONG_STATUS_LISTEN
+          value: "0.0.0.0:8100, [::]:8100"
+        - name: KONG_STREAM_LISTEN
+          value: "off"
+        volumeMounts:
+        - name: chartsnap-kong-prefix-dir
+          mountPath: /kong_prefix/
+        - name: chartsnap-kong-tmp
+          mountPath: /tmp
+      containers:
+      - name: ingress-controller
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+          runAsGroup: 1000
+          runAsNonRoot: true
+          runAsUser: 1000
+          seccompProfile:
+            type: RuntimeDefault
+        args:
+        ports:
+        - name: webhook
+          containerPort: 8080
+          protocol: TCP
+        - name: cmetrics
+          containerPort: 10255
+          protocol: TCP
+        - name: cstatus
+          containerPort: 10254
+          protocol: TCP
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        - name: CONTROLLER_ADMISSION_WEBHOOK_LISTEN
+          value: "0.0.0.0:8080"
+        - name: CONTROLLER_ELECTION_ID
+          value: "kong-ingress-controller-leader-kong"
+        - name: CONTROLLER_INGRESS_CLASS
+          value: "kong"
+        - name: CONTROLLER_KONG_ADMIN_TLS_SKIP_VERIFY
+          value: "true"
+        - name: CONTROLLER_KONG_ADMIN_URL
+          value: "https://localhost:8444"
+        - name: CONTROLLER_PUBLISH_SERVICE
+          value: "default/chartsnap-kong-proxy"
+        image: kong/kubernetes-ingress-controller:3.5
+        imagePullPolicy: IfNotPresent
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /readyz
+            port: 10254
+            scheme: HTTP
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 5
+        livenessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /healthz
+            port: 10254
+            scheme: HTTP
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 5
+        resources: {}
+        volumeMounts:
+        - name: webhook-cert
+          mountPath: /admission-webhook
+          readOnly: true
+        - name: chartsnap-kong-token
+          mountPath: /var/run/secrets/kubernetes.io/serviceaccount
+          readOnly: true
+      - name: "proxy"
+        image: kong:3.9
+        imagePullPolicy: IfNotPresent
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+          runAsGroup: 1000
+          runAsNonRoot: true
+          runAsUser: 1000
+          seccompProfile:
+            type: RuntimeDefault
+        env:
+        - name: KONG_ADMIN_ACCESS_LOG
+          value: "/dev/stdout"
+        - name: KONG_ADMIN_ERROR_LOG
+          value: "/dev/stderr"
+        - name: KONG_ADMIN_GUI_ACCESS_LOG
+          value: "/dev/stdout"
+        - name: KONG_ADMIN_GUI_ERROR_LOG
+          value: "/dev/stderr"
+        - name: KONG_ADMIN_LISTEN
+          value: "127.0.0.1:8444 http2 ssl, [::1]:8444 http2 ssl"
+        - name: KONG_CLUSTER_LISTEN
+          value: "off"
+        - name: KONG_DATABASE
+          value: "off"
+        - name: KONG_KIC
+          value: "on"
+        - name: KONG_LUA_PACKAGE_PATH
+          value: "/opt/?.lua;/opt/?/init.lua;;"
+        - name: KONG_NGINX_WORKER_PROCESSES
+          value: "2"
+        - name: KONG_PORTAL_API_ACCESS_LOG
+          value: "/dev/stdout"
+        - name: KONG_PORTAL_API_ERROR_LOG
+          value: "/dev/stderr"
+        - name: KONG_PORT_MAPS
+          value: "80:8000, 443:8443"
+        - name: KONG_PREFIX
+          value: "/kong_prefix/"
+        - name: KONG_PROXY_ACCESS_LOG
+          value: "/dev/stdout"
+        - name: KONG_PROXY_ERROR_LOG
+          value: "/dev/stderr"
+        - name: KONG_PROXY_LISTEN
+          value: "0.0.0.0:8000, [::]:8000, 0.0.0.0:8443 http2 ssl, [::]:8443 http2 ssl"
+        - name: KONG_PROXY_STREAM_ACCESS_LOG
+          value: "/dev/stdout basic"
+        - name: KONG_PROXY_STREAM_ERROR_LOG
+          value: "/dev/stderr"
+        - name: KONG_ROUTER_FLAVOR
+          value: "traditional"
+        - name: KONG_STATUS_ACCESS_LOG
+          value: "off"
+        - name: KONG_STATUS_ERROR_LOG
+          value: "/dev/stderr"
+        - name: KONG_STATUS_LISTEN
+          value: "0.0.0.0:8100, [::]:8100"
+        - name: KONG_STREAM_LISTEN
+          value: "off"
+        - name: KONG_NGINX_DAEMON
+          value: "off"
+        lifecycle:
+          preStop:
+            exec:
+              command:
+              - kong
+              - quit
+              - --wait=15
+        ports:
+        - name: proxy
+          containerPort: 8000
+          protocol: TCP
+        - name: proxy-tls
+          containerPort: 8443
+          protocol: TCP
+        - name: status
+          containerPort: 8100
+          protocol: TCP
+        volumeMounts:
+        - name: chartsnap-kong-prefix-dir
+          mountPath: /kong_prefix/
+        - name: chartsnap-kong-tmp
+          mountPath: /tmp
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /status/ready
+            port: status
+            scheme: HTTP
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 5
+        livenessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /status
+            port: status
+            scheme: HTTP
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 5
+        resources: {}
+      securityContext:
+        seccompProfile:
+          type: RuntimeDefault
+      terminationGracePeriodSeconds: 30
+      volumes:
+      - name: chartsnap-kong-prefix-dir
+        emptyDir:
+          sizeLimit: 256Mi
+      - name: chartsnap-kong-tmp
+        emptyDir:
+          sizeLimit: 1Gi
+      - name: chartsnap-kong-token
+        projected:
+          sources:
+          - serviceAccountToken:
+              expirationSeconds: 3607
+              path: token
+          - configMap:
+              items:
+              - key: ca.crt
+                path: ca.crt
+              name: kube-root-ca.crt
+          - downwardAPI:
+              items:
+              - fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.namespace
+                path: namespace
+      - name: webhook-cert
+        secret:
+          secretName: chartsnap-kong-validation-webhook-keypair
+---
+# Source: kong/templates/admission-webhook.yaml
+kind: ValidatingWebhookConfiguration
+apiVersion: admissionregistration.k8s.io/v1
+metadata:
+  name: chartsnap-kong-default-validations
+  labels:
+    app.kubernetes.io/name: kong
+    helm.sh/chart: kong-3.1.0
+    app.kubernetes.io/instance: "chartsnap"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/version: "3.9"
+webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    caBundle: '###DYNAMIC_FIELD###'
+    service:
+      name: chartsnap-kong-validation-webhook
+      namespace: default
+  failurePolicy: Ignore
+  matchPolicy: Equivalent
+  name: secrets.credentials.validation.ingress-controller.konghq.com
+  objectSelector:
+    matchLabels:
+      app.kubernetes.io/instance: kong-custom
+    matchExpressions:
+    - key: "konghq.com/credential"
+      operator: "Exists"
+    - key: "konghq.com/credential"
+      operator: "NotIn"
+      values:
+      - "konnect"
+    - key: environment
+      operator: In
+      values:
+      - production
+  rules:
+  - apiGroups:
+    - ""
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - secrets
+  sideEffects: None
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    caBundle: '###DYNAMIC_FIELD###'
+    service:
+      name: chartsnap-kong-validation-webhook
+      namespace: default
+  failurePolicy: Ignore
+  matchPolicy: Equivalent
+  name: secrets.plugins.validation.ingress-controller.konghq.com
+  objectSelector:
+    matchLabels:
+      app.kubernetes.io/instance: kong-custom
+    matchExpressions:
+    - key: "konghq.com/credential"
+      operator: "NotIn"
+      values:
+      - "konnect"
+    - key: environment
+      operator: In
+      values:
+      - production
+  rules:
+  - apiGroups:
+    - ""
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - secrets
+  sideEffects: None
+- name: validations.kong.konghq.com
+  matchPolicy: Equivalent
+  objectSelector:
+    matchExpressions:
+    - key: environment
+      operator: In
+      values:
+      - production
+    matchLabels:
+      app.kubernetes.io/instance: kong-custom
+  failurePolicy: Ignore
+  sideEffects: None
+  admissionReviewVersions: ["v1beta1"]
+  rules:
+  - apiGroups:
+    - configuration.konghq.com
+    apiVersions:
+    - '*'
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - kongconsumers
+    - kongplugins
+    - kongclusterplugins
+    - kongingresses
+  - apiGroups:
+    - ''
+    apiVersions:
+    - 'v1'
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - services
+  - apiGroups:
+    - networking.k8s.io
+    apiVersions:
+    - 'v1'
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - ingresses
+  - apiGroups:
+    - gateway.networking.k8s.io
+    apiVersions:
+    - 'v1alpha2'
+    - 'v1beta1'
+    - 'v1'
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - gateways
+    - httproutes
+  clientConfig:
+    caBundle: '###DYNAMIC_FIELD###'
+    service:
+      name: chartsnap-kong-validation-webhook
+      namespace: default
diff --git a/charts/kong/ci/__snapshots__/certificate-values.snap b/charts/kong/ci/__snapshots__/certificate-values.snap
index 6b0387c65..cb6b3a108 100644
--- a/charts/kong/ci/__snapshots__/certificate-values.snap
+++ b/charts/kong/ci/__snapshots__/certificate-values.snap
@@ -8,7 +8,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -21,7 +21,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -38,7 +38,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -53,7 +53,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -503,7 +503,7 @@ metadata:
   name: chartsnap-kong
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -524,7 +524,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -594,7 +594,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -615,7 +615,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -627,7 +627,7 @@ spec:
     targetPort: webhook
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -641,7 +641,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -657,7 +657,7 @@ spec:
     targetPort: cstatus
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -671,7 +671,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -699,7 +699,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -728,7 +728,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -749,7 +749,7 @@ spec:
         traffic.sidecar.istio.io/includeInboundPorts: ""
       labels:
         app.kubernetes.io/name: kong
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         app.kubernetes.io/instance: "chartsnap"
         app.kubernetes.io/managed-by: "Helm"
         app.kubernetes.io/version: "3.9"
@@ -1099,7 +1099,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1119,7 +1119,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1139,7 +1139,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1158,7 +1158,7 @@ metadata:
   name: chartsnap-kong-default-validations
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1181,6 +1181,10 @@ webhooks:
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
@@ -1204,14 +1208,14 @@ webhooks:
   name: secrets.plugins.validation.ingress-controller.konghq.com
   objectSelector:
     matchExpressions:
-    - key: owner
-      operator: NotIn
-      values:
-      - helm
     - key: "konghq.com/credential"
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
diff --git a/charts/kong/ci/__snapshots__/certificates-enabled-values.snap b/charts/kong/ci/__snapshots__/certificates-enabled-values.snap
index f90105a07..c81d3b0bb 100644
--- a/charts/kong/ci/__snapshots__/certificates-enabled-values.snap
+++ b/charts/kong/ci/__snapshots__/certificates-enabled-values.snap
@@ -8,7 +8,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -21,7 +21,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -38,7 +38,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -53,7 +53,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -503,7 +503,7 @@ metadata:
   name: chartsnap-kong
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -524,7 +524,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -594,7 +594,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -615,7 +615,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -627,7 +627,7 @@ spec:
     targetPort: webhook
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -641,7 +641,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -657,7 +657,7 @@ spec:
     targetPort: cstatus
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -671,7 +671,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -699,7 +699,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -728,7 +728,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -749,7 +749,7 @@ spec:
         traffic.sidecar.istio.io/includeInboundPorts: ""
       labels:
         app.kubernetes.io/name: kong
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         app.kubernetes.io/instance: "chartsnap"
         app.kubernetes.io/managed-by: "Helm"
         app.kubernetes.io/version: "3.9"
@@ -1101,7 +1101,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1121,7 +1121,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1141,7 +1141,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1160,7 +1160,7 @@ metadata:
   name: chartsnap-kong-default-validations
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1183,6 +1183,10 @@ webhooks:
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
@@ -1206,14 +1210,14 @@ webhooks:
   name: secrets.plugins.validation.ingress-controller.konghq.com
   objectSelector:
     matchExpressions:
-    - key: owner
-      operator: NotIn
-      values:
-      - helm
     - key: "konghq.com/credential"
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
diff --git a/charts/kong/ci/__snapshots__/custom-entities-rbac-3.2-values.snap b/charts/kong/ci/__snapshots__/custom-entities-rbac-3.2-values.snap
index 1aa376c56..a29892638 100644
--- a/charts/kong/ci/__snapshots__/custom-entities-rbac-3.2-values.snap
+++ b/charts/kong/ci/__snapshots__/custom-entities-rbac-3.2-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -21,7 +21,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-ca-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -50,7 +50,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 rules:
   - apiGroups:
@@ -475,7 +475,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -494,7 +494,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 rules:
@@ -558,7 +558,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 roleRef:
@@ -578,7 +578,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook
   namespace: default
 spec:
@@ -593,7 +593,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -603,7 +603,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-metrics
   namespace: default
 spec:
@@ -622,7 +622,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -632,7 +632,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -660,7 +660,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -688,7 +688,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -712,7 +712,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -1022,7 +1022,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default-validations
 webhooks:
   - admissionReviewVersions:
@@ -1043,6 +1043,10 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
@@ -1066,14 +1070,14 @@ webhooks:
     name: secrets.plugins.validation.ingress-controller.konghq.com
     objectSelector:
       matchExpressions:
-        - key: owner
-          operator: NotIn
-          values:
-            - helm
         - key: konghq.com/credential
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
diff --git a/charts/kong/ci/__snapshots__/custom-labels-values.snap b/charts/kong/ci/__snapshots__/custom-labels-values.snap
index 179ccc49a..1d277b7e9 100644
--- a/charts/kong/ci/__snapshots__/custom-labels-values.snap
+++ b/charts/kong/ci/__snapshots__/custom-labels-values.snap
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-ca-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -40,7 +40,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -54,7 +54,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 rules:
   - apiGroups:
@@ -503,7 +503,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -523,7 +523,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 rules:
@@ -588,7 +588,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 roleRef:
@@ -609,7 +609,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook
   namespace: default
 spec:
@@ -625,7 +625,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -636,7 +636,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-metrics
   namespace: default
 spec:
@@ -656,7 +656,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -667,7 +667,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -696,7 +696,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -725,7 +725,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -750,7 +750,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -1059,7 +1059,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default-validations
 webhooks:
   - admissionReviewVersions:
@@ -1080,6 +1080,10 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
@@ -1103,14 +1107,14 @@ webhooks:
     name: secrets.plugins.validation.ingress-controller.konghq.com
     objectSelector:
       matchExpressions:
-        - key: owner
-          operator: NotIn
-          values:
-            - helm
         - key: konghq.com/credential
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
diff --git a/charts/kong/ci/__snapshots__/default-values.snap b/charts/kong/ci/__snapshots__/default-values.snap
index 9e651bc2c..e047ef941 100644
--- a/charts/kong/ci/__snapshots__/default-values.snap
+++ b/charts/kong/ci/__snapshots__/default-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -21,7 +21,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-ca-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -50,7 +50,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 rules:
   - apiGroups:
@@ -498,7 +498,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -517,7 +517,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 rules:
@@ -581,7 +581,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 roleRef:
@@ -601,7 +601,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook
   namespace: default
 spec:
@@ -616,7 +616,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -626,7 +626,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-metrics
   namespace: default
 spec:
@@ -645,7 +645,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -655,7 +655,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -683,7 +683,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -711,7 +711,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -735,7 +735,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -1045,7 +1045,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default-validations
 webhooks:
   - admissionReviewVersions:
@@ -1066,6 +1066,10 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
@@ -1089,14 +1093,14 @@ webhooks:
     name: secrets.plugins.validation.ingress-controller.konghq.com
     objectSelector:
       matchExpressions:
-        - key: owner
-          operator: NotIn
-          values:
-            - helm
         - key: konghq.com/credential
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
diff --git a/charts/kong/ci/__snapshots__/disable-creating-ingress-class.snap b/charts/kong/ci/__snapshots__/disable-creating-ingress-class.snap
index ad72842d9..ef3e0fabb 100644
--- a/charts/kong/ci/__snapshots__/disable-creating-ingress-class.snap
+++ b/charts/kong/ci/__snapshots__/disable-creating-ingress-class.snap
@@ -8,7 +8,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -21,7 +21,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -38,7 +38,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -53,7 +53,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -495,7 +495,7 @@ metadata:
   name: chartsnap-kong
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -516,7 +516,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -586,7 +586,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -607,7 +607,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -619,7 +619,7 @@ spec:
     targetPort: webhook
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -633,7 +633,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -649,7 +649,7 @@ spec:
     targetPort: cstatus
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -663,7 +663,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -691,7 +691,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -720,7 +720,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -741,7 +741,7 @@ spec:
         traffic.sidecar.istio.io/includeInboundPorts: ""
       labels:
         app.kubernetes.io/name: kong
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         app.kubernetes.io/instance: "chartsnap"
         app.kubernetes.io/managed-by: "Helm"
         app.kubernetes.io/version: "3.9"
@@ -1051,7 +1051,7 @@ metadata:
   name: chartsnap-kong-default-validations
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1074,6 +1074,10 @@ webhooks:
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
@@ -1097,14 +1101,14 @@ webhooks:
   name: secrets.plugins.validation.ingress-controller.konghq.com
   objectSelector:
     matchExpressions:
-    - key: owner
-      operator: NotIn
-      values:
-      - helm
     - key: "konghq.com/credential"
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
diff --git a/charts/kong/ci/__snapshots__/enterprise-manager-cert-values.snap b/charts/kong/ci/__snapshots__/enterprise-manager-cert-values.snap
index e1679a8ef..10aa3ea4b 100644
--- a/charts/kong/ci/__snapshots__/enterprise-manager-cert-values.snap
+++ b/charts/kong/ci/__snapshots__/enterprise-manager-cert-values.snap
@@ -8,7 +8,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -21,7 +21,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -38,7 +38,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -53,7 +53,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -503,7 +503,7 @@ metadata:
   name: chartsnap-kong
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -524,7 +524,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -594,7 +594,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -615,7 +615,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -627,7 +627,7 @@ spec:
     targetPort: webhook
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -641,7 +641,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -657,7 +657,7 @@ spec:
     targetPort: cstatus
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -671,7 +671,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -695,7 +695,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -719,7 +719,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -747,7 +747,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -775,7 +775,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -804,7 +804,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -825,7 +825,7 @@ spec:
         traffic.sidecar.istio.io/includeInboundPorts: ""
       labels:
         app.kubernetes.io/name: kong
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         app.kubernetes.io/instance: "chartsnap"
         app.kubernetes.io/managed-by: "Helm"
         app.kubernetes.io/version: "3.10"
@@ -1253,7 +1253,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -1275,7 +1275,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -1295,7 +1295,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -1317,7 +1317,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -1337,7 +1337,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -1356,7 +1356,7 @@ metadata:
   name: chartsnap-kong-default-validations
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.10"
@@ -1379,6 +1379,10 @@ webhooks:
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
@@ -1402,14 +1406,14 @@ webhooks:
   name: secrets.plugins.validation.ingress-controller.konghq.com
   objectSelector:
     matchExpressions:
-    - key: owner
-      operator: NotIn
-      values:
-      - helm
     - key: "konghq.com/credential"
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
diff --git a/charts/kong/ci/__snapshots__/enterprise-postgres-basicauth.snap b/charts/kong/ci/__snapshots__/enterprise-postgres-basicauth.snap
index b36d56ccd..686b7522e 100644
--- a/charts/kong/ci/__snapshots__/enterprise-postgres-basicauth.snap
+++ b/charts/kong/ci/__snapshots__/enterprise-postgres-basicauth.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.6"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -18,7 +18,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.6"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -45,7 +45,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.6"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-portalapi
   namespace: default
 spec:
@@ -72,7 +72,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.6"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-portal
   namespace: default
 spec:
@@ -100,7 +100,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.6"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -128,7 +128,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.6"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -152,7 +152,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.6"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.6"
     spec:
       automountServiceAccountToken: false
diff --git a/charts/kong/ci/__snapshots__/enterprise-postgres-openidconnect-below-360.snap b/charts/kong/ci/__snapshots__/enterprise-postgres-openidconnect-below-360.snap
index dde9b0691..d523a715e 100644
--- a/charts/kong/ci/__snapshots__/enterprise-postgres-openidconnect-below-360.snap
+++ b/charts/kong/ci/__snapshots__/enterprise-postgres-openidconnect-below-360.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.5"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -18,7 +18,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.5"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -45,7 +45,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.5"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-portalapi
   namespace: default
 spec:
@@ -72,7 +72,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.5"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-portal
   namespace: default
 spec:
@@ -100,7 +100,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.5"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -128,7 +128,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.5"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -152,7 +152,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.5"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.5"
     spec:
       automountServiceAccountToken: false
diff --git a/charts/kong/ci/__snapshots__/enterprise-postgres-openidconnect.snap b/charts/kong/ci/__snapshots__/enterprise-postgres-openidconnect.snap
index 1cbc91365..5eb81f190 100644
--- a/charts/kong/ci/__snapshots__/enterprise-postgres-openidconnect.snap
+++ b/charts/kong/ci/__snapshots__/enterprise-postgres-openidconnect.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.6"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -18,7 +18,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.6"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -45,7 +45,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.6"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-portalapi
   namespace: default
 spec:
@@ -72,7 +72,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.6"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-portal
   namespace: default
 spec:
@@ -100,7 +100,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.6"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -128,7 +128,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.6"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -152,7 +152,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.6"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.6"
     spec:
       automountServiceAccountToken: false
diff --git a/charts/kong/ci/__snapshots__/kong-ingress-1-values.snap b/charts/kong/ci/__snapshots__/kong-ingress-1-values.snap
index 07a5fd33f..be8f1eb1b 100644
--- a/charts/kong/ci/__snapshots__/kong-ingress-1-values.snap
+++ b/charts/kong/ci/__snapshots__/kong-ingress-1-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -21,7 +21,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-ca-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -59,7 +59,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 rules:
   - apiGroups:
@@ -507,7 +507,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -526,7 +526,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 rules:
@@ -590,7 +590,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 roleRef:
@@ -610,7 +610,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook
   namespace: default
 spec:
@@ -625,7 +625,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -635,7 +635,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-metrics
   namespace: default
 spec:
@@ -654,7 +654,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -664,7 +664,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -692,7 +692,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -720,7 +720,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -744,7 +744,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -1054,7 +1054,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -1080,7 +1080,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default-validations
 webhooks:
   - admissionReviewVersions:
@@ -1101,6 +1101,10 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
@@ -1124,14 +1128,14 @@ webhooks:
     name: secrets.plugins.validation.ingress-controller.konghq.com
     objectSelector:
       matchExpressions:
-        - key: owner
-          operator: NotIn
-          values:
-            - helm
         - key: konghq.com/credential
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
diff --git a/charts/kong/ci/__snapshots__/kong-ingress-2-values.snap b/charts/kong/ci/__snapshots__/kong-ingress-2-values.snap
index 35f4675a8..0090f97db 100644
--- a/charts/kong/ci/__snapshots__/kong-ingress-2-values.snap
+++ b/charts/kong/ci/__snapshots__/kong-ingress-2-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -21,7 +21,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-ca-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -59,7 +59,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 rules:
   - apiGroups:
@@ -507,7 +507,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -526,7 +526,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 rules:
@@ -590,7 +590,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 roleRef:
@@ -610,7 +610,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook
   namespace: default
 spec:
@@ -625,7 +625,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -635,7 +635,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-metrics
   namespace: default
 spec:
@@ -654,7 +654,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -664,7 +664,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -692,7 +692,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -720,7 +720,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -744,7 +744,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -1054,7 +1054,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -1082,7 +1082,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default-validations
 webhooks:
   - admissionReviewVersions:
@@ -1103,6 +1103,10 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
@@ -1126,14 +1130,14 @@ webhooks:
     name: secrets.plugins.validation.ingress-controller.konghq.com
     objectSelector:
       matchExpressions:
-        - key: owner
-          operator: NotIn
-          values:
-            - helm
         - key: konghq.com/credential
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
diff --git a/charts/kong/ci/__snapshots__/kong-ingress-3-values.snap b/charts/kong/ci/__snapshots__/kong-ingress-3-values.snap
index f95982183..3f6a853cb 100644
--- a/charts/kong/ci/__snapshots__/kong-ingress-3-values.snap
+++ b/charts/kong/ci/__snapshots__/kong-ingress-3-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -21,7 +21,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-ca-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -50,7 +50,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 rules:
   - apiGroups:
@@ -498,7 +498,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -517,7 +517,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 rules:
@@ -581,7 +581,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 roleRef:
@@ -601,7 +601,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook
   namespace: default
 spec:
@@ -616,7 +616,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -626,7 +626,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-metrics
   namespace: default
 spec:
@@ -645,7 +645,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -655,7 +655,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -683,7 +683,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -711,7 +711,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -735,7 +735,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -1045,7 +1045,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -1069,7 +1069,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default-validations
 webhooks:
   - admissionReviewVersions:
@@ -1090,6 +1090,10 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
@@ -1113,14 +1117,14 @@ webhooks:
     name: secrets.plugins.validation.ingress-controller.konghq.com
     objectSelector:
       matchExpressions:
-        - key: owner
-          operator: NotIn
-          values:
-            - helm
         - key: konghq.com/credential
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
diff --git a/charts/kong/ci/__snapshots__/kong-ingress-4-values.snap b/charts/kong/ci/__snapshots__/kong-ingress-4-values.snap
index 047ae9749..b9cbaa1de 100644
--- a/charts/kong/ci/__snapshots__/kong-ingress-4-values.snap
+++ b/charts/kong/ci/__snapshots__/kong-ingress-4-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -21,7 +21,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-ca-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -68,7 +68,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 rules:
   - apiGroups:
@@ -516,7 +516,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -535,7 +535,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 rules:
@@ -599,7 +599,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 roleRef:
@@ -619,7 +619,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook
   namespace: default
 spec:
@@ -634,7 +634,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -644,7 +644,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-metrics
   namespace: default
 spec:
@@ -663,7 +663,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -673,7 +673,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -701,7 +701,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -729,7 +729,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -753,7 +753,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -1063,7 +1063,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -1122,7 +1122,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default-validations
 webhooks:
   - admissionReviewVersions:
@@ -1143,6 +1143,10 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
@@ -1166,14 +1170,14 @@ webhooks:
     name: secrets.plugins.validation.ingress-controller.konghq.com
     objectSelector:
       matchExpressions:
-        - key: owner
-          operator: NotIn
-          values:
-            - helm
         - key: konghq.com/credential
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
diff --git a/charts/kong/ci/__snapshots__/kong-ingress-5-3.1-rbac-values.snap b/charts/kong/ci/__snapshots__/kong-ingress-5-3.1-rbac-values.snap
index 8c5b08b4e..c8beb5bb4 100644
--- a/charts/kong/ci/__snapshots__/kong-ingress-5-3.1-rbac-values.snap
+++ b/charts/kong/ci/__snapshots__/kong-ingress-5-3.1-rbac-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -21,7 +21,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-ca-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -50,7 +50,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 rules:
   - apiGroups:
@@ -459,7 +459,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -478,7 +478,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 rules:
@@ -542,7 +542,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 roleRef:
@@ -562,7 +562,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook
   namespace: default
 spec:
@@ -577,7 +577,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -587,7 +587,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-metrics
   namespace: default
 spec:
@@ -606,7 +606,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -616,7 +616,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -644,7 +644,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -672,7 +672,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -696,7 +696,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -1006,7 +1006,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default-validations
 webhooks:
   - admissionReviewVersions:
@@ -1027,6 +1027,10 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
@@ -1050,14 +1054,14 @@ webhooks:
     name: secrets.plugins.validation.ingress-controller.konghq.com
     objectSelector:
       matchExpressions:
-        - key: owner
-          operator: NotIn
-          values:
-            - helm
         - key: konghq.com/credential
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
diff --git a/charts/kong/ci/__snapshots__/kong-ingress-5-3.4-rbac-values.snap b/charts/kong/ci/__snapshots__/kong-ingress-5-3.4-rbac-values.snap
index 579081cba..195b8f187 100644
--- a/charts/kong/ci/__snapshots__/kong-ingress-5-3.4-rbac-values.snap
+++ b/charts/kong/ci/__snapshots__/kong-ingress-5-3.4-rbac-values.snap
@@ -8,7 +8,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -21,7 +21,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -38,7 +38,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -53,7 +53,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -503,7 +503,7 @@ metadata:
   name: chartsnap-kong
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -524,7 +524,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -594,7 +594,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -615,7 +615,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -627,7 +627,7 @@ spec:
     targetPort: webhook
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -641,7 +641,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -657,7 +657,7 @@ spec:
     targetPort: cstatus
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -671,7 +671,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -699,7 +699,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -728,7 +728,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -749,7 +749,7 @@ spec:
         traffic.sidecar.istio.io/includeInboundPorts: ""
       labels:
         app.kubernetes.io/name: kong
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         app.kubernetes.io/instance: "chartsnap"
         app.kubernetes.io/managed-by: "Helm"
         app.kubernetes.io/version: "3.9"
@@ -1063,7 +1063,7 @@ metadata:
   name: chartsnap-kong-default-validations
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1086,6 +1086,10 @@ webhooks:
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
@@ -1109,14 +1113,14 @@ webhooks:
   name: secrets.plugins.validation.ingress-controller.konghq.com
   objectSelector:
     matchExpressions:
-    - key: owner
-      operator: NotIn
-      values:
-      - helm
     - key: "konghq.com/credential"
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
diff --git a/charts/kong/ci/__snapshots__/kong-ingress-image-pull-secrets-values.snap b/charts/kong/ci/__snapshots__/kong-ingress-image-pull-secrets-values.snap
index 2f155a7dc..f6af2d8c5 100644
--- a/charts/kong/ci/__snapshots__/kong-ingress-image-pull-secrets-values.snap
+++ b/charts/kong/ci/__snapshots__/kong-ingress-image-pull-secrets-values.snap
@@ -8,7 +8,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -21,7 +21,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -38,7 +38,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -53,7 +53,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -503,7 +503,7 @@ metadata:
   name: chartsnap-kong
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -524,7 +524,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -594,7 +594,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -615,7 +615,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -627,7 +627,7 @@ spec:
     targetPort: webhook
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -641,7 +641,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -657,7 +657,7 @@ spec:
     targetPort: cstatus
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -671,7 +671,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -699,7 +699,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -728,7 +728,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -749,7 +749,7 @@ spec:
         traffic.sidecar.istio.io/includeInboundPorts: ""
       labels:
         app.kubernetes.io/name: kong
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         app.kubernetes.io/instance: "chartsnap"
         app.kubernetes.io/managed-by: "Helm"
         app.kubernetes.io/version: "3.9"
@@ -1065,7 +1065,7 @@ metadata:
   name: chartsnap-kong-default-validations
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1088,6 +1088,10 @@ webhooks:
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
@@ -1111,14 +1115,14 @@ webhooks:
   name: secrets.plugins.validation.ingress-controller.konghq.com
   objectSelector:
     matchExpressions:
-    - key: owner
-      operator: NotIn
-      values:
-      - helm
     - key: "konghq.com/credential"
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
diff --git a/charts/kong/ci/__snapshots__/kong-ingress-with-konnect-license.snap b/charts/kong/ci/__snapshots__/kong-ingress-with-konnect-license.snap
index 9a057fb4c..d3ee97da3 100644
--- a/charts/kong/ci/__snapshots__/kong-ingress-with-konnect-license.snap
+++ b/charts/kong/ci/__snapshots__/kong-ingress-with-konnect-license.snap
@@ -8,7 +8,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -21,7 +21,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -38,7 +38,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -60,7 +60,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -525,7 +525,7 @@ metadata:
   name: chartsnap-kong
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -546,7 +546,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -616,7 +616,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -637,7 +637,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -649,7 +649,7 @@ spec:
     targetPort: webhook
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -663,7 +663,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -679,7 +679,7 @@ spec:
     targetPort: cstatus
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -693,7 +693,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -714,7 +714,7 @@ spec:
         traffic.sidecar.istio.io/includeInboundPorts: ""
       labels:
         app.kubernetes.io/name: kong
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         app.kubernetes.io/instance: "chartsnap"
         app.kubernetes.io/managed-by: "Helm"
         app.kubernetes.io/version: "3.9"
@@ -860,7 +860,7 @@ metadata:
   name: chartsnap-kong-default-validations
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -883,6 +883,10 @@ webhooks:
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
@@ -906,14 +910,14 @@ webhooks:
   name: secrets.plugins.validation.ingress-controller.konghq.com
   objectSelector:
     matchExpressions:
-    - key: owner
-      operator: NotIn
-      values:
-      - helm
     - key: "konghq.com/credential"
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
diff --git a/charts/kong/ci/__snapshots__/pdb-always-allow.snap b/charts/kong/ci/__snapshots__/pdb-always-allow.snap
index 1dfdfa9a3..b5bca96ee 100644
--- a/charts/kong/ci/__snapshots__/pdb-always-allow.snap
+++ b/charts/kong/ci/__snapshots__/pdb-always-allow.snap
@@ -8,7 +8,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -18,7 +18,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: kong
-      helm.sh/chart: kong-3.0.2
+      helm.sh/chart: kong-3.1.0
       app.kubernetes.io/instance: "chartsnap"
       app.kubernetes.io/managed-by: "Helm"
       app.kubernetes.io/version: "3.9"
@@ -32,7 +32,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -45,7 +45,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -62,7 +62,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -77,7 +77,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -527,7 +527,7 @@ metadata:
   name: chartsnap-kong
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -548,7 +548,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -618,7 +618,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -639,7 +639,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -651,7 +651,7 @@ spec:
     targetPort: webhook
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -665,7 +665,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -681,7 +681,7 @@ spec:
     targetPort: cstatus
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -695,7 +695,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -723,7 +723,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -752,7 +752,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -773,7 +773,7 @@ spec:
         traffic.sidecar.istio.io/includeInboundPorts: ""
       labels:
         app.kubernetes.io/name: kong
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         app.kubernetes.io/instance: "chartsnap"
         app.kubernetes.io/managed-by: "Helm"
         app.kubernetes.io/version: "3.9"
@@ -1087,7 +1087,7 @@ metadata:
   name: chartsnap-kong-default-validations
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1110,6 +1110,10 @@ webhooks:
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
@@ -1133,14 +1137,14 @@ webhooks:
   name: secrets.plugins.validation.ingress-controller.konghq.com
   objectSelector:
     matchExpressions:
-    - key: owner
-      operator: NotIn
-      values:
-      - helm
     - key: "konghq.com/credential"
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
diff --git a/charts/kong/ci/__snapshots__/pdb-default.snap b/charts/kong/ci/__snapshots__/pdb-default.snap
index 3a80c38ef..475da2b23 100644
--- a/charts/kong/ci/__snapshots__/pdb-default.snap
+++ b/charts/kong/ci/__snapshots__/pdb-default.snap
@@ -8,7 +8,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -18,7 +18,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: kong
-      helm.sh/chart: kong-3.0.2
+      helm.sh/chart: kong-3.1.0
       app.kubernetes.io/instance: "chartsnap"
       app.kubernetes.io/managed-by: "Helm"
       app.kubernetes.io/version: "3.9"
@@ -32,7 +32,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -45,7 +45,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -62,7 +62,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -77,7 +77,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -527,7 +527,7 @@ metadata:
   name: chartsnap-kong
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -548,7 +548,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -618,7 +618,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -639,7 +639,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -651,7 +651,7 @@ spec:
     targetPort: webhook
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -665,7 +665,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -681,7 +681,7 @@ spec:
     targetPort: cstatus
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -695,7 +695,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -723,7 +723,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -752,7 +752,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -773,7 +773,7 @@ spec:
         traffic.sidecar.istio.io/includeInboundPorts: ""
       labels:
         app.kubernetes.io/name: kong
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         app.kubernetes.io/instance: "chartsnap"
         app.kubernetes.io/managed-by: "Helm"
         app.kubernetes.io/version: "3.9"
@@ -1087,7 +1087,7 @@ metadata:
   name: chartsnap-kong-default-validations
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1110,6 +1110,10 @@ webhooks:
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
@@ -1133,14 +1137,14 @@ webhooks:
   name: secrets.plugins.validation.ingress-controller.konghq.com
   objectSelector:
     matchExpressions:
-    - key: owner
-      operator: NotIn
-      values:
-      - helm
     - key: "konghq.com/credential"
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
diff --git a/charts/kong/ci/__snapshots__/proxy-appprotocol-values.snap b/charts/kong/ci/__snapshots__/proxy-appprotocol-values.snap
index b0519697e..6466b14ed 100644
--- a/charts/kong/ci/__snapshots__/proxy-appprotocol-values.snap
+++ b/charts/kong/ci/__snapshots__/proxy-appprotocol-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -21,7 +21,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-ca-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -50,7 +50,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 rules:
   - apiGroups:
@@ -498,7 +498,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -517,7 +517,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 rules:
@@ -581,7 +581,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 roleRef:
@@ -601,7 +601,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook
   namespace: default
 spec:
@@ -616,7 +616,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -626,7 +626,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-metrics
   namespace: default
 spec:
@@ -645,7 +645,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -655,7 +655,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -683,7 +683,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -713,7 +713,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -737,7 +737,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -1047,7 +1047,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default-validations
 webhooks:
   - admissionReviewVersions:
@@ -1068,6 +1068,10 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
@@ -1091,14 +1095,14 @@ webhooks:
     name: secrets.plugins.validation.ingress-controller.konghq.com
     objectSelector:
       matchExpressions:
-        - key: owner
-          operator: NotIn
-          values:
-            - helm
         - key: konghq.com/credential
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
diff --git a/charts/kong/ci/__snapshots__/service-account.snap b/charts/kong/ci/__snapshots__/service-account.snap
index be5b4a8c2..ce0af50ae 100644
--- a/charts/kong/ci/__snapshots__/service-account.snap
+++ b/charts/kong/ci/__snapshots__/service-account.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: my-kong-sa
   namespace: default
 ---
@@ -21,7 +21,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-ca-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -50,7 +50,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 rules:
   - apiGroups:
@@ -498,7 +498,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -517,7 +517,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 rules:
@@ -581,7 +581,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 roleRef:
@@ -601,7 +601,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook
   namespace: default
 spec:
@@ -616,7 +616,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -626,7 +626,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-metrics
   namespace: default
 spec:
@@ -645,7 +645,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -655,7 +655,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -683,7 +683,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -711,7 +711,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -735,7 +735,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -1045,7 +1045,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default-validations
 webhooks:
   - admissionReviewVersions:
@@ -1066,6 +1066,10 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
@@ -1089,14 +1093,14 @@ webhooks:
     name: secrets.plugins.validation.ingress-controller.konghq.com
     objectSelector:
       matchExpressions:
-        - key: owner
-          operator: NotIn
-          values:
-            - helm
         - key: konghq.com/credential
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
diff --git a/charts/kong/ci/__snapshots__/service-proxy-nameoverride-values.snap b/charts/kong/ci/__snapshots__/service-proxy-nameoverride-values.snap
index 8291861b1..8a298638d 100644
--- a/charts/kong/ci/__snapshots__/service-proxy-nameoverride-values.snap
+++ b/charts/kong/ci/__snapshots__/service-proxy-nameoverride-values.snap
@@ -8,7 +8,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -21,7 +21,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -38,7 +38,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -53,7 +53,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -503,7 +503,7 @@ metadata:
   name: chartsnap-kong
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -524,7 +524,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -594,7 +594,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -615,7 +615,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -627,7 +627,7 @@ spec:
     targetPort: webhook
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -641,7 +641,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -657,7 +657,7 @@ spec:
     targetPort: cstatus
   selector:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -671,7 +671,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -699,7 +699,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -728,7 +728,7 @@ metadata:
   namespace: default
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -749,7 +749,7 @@ spec:
         traffic.sidecar.istio.io/includeInboundPorts: ""
       labels:
         app.kubernetes.io/name: kong
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         app.kubernetes.io/instance: "chartsnap"
         app.kubernetes.io/managed-by: "Helm"
         app.kubernetes.io/version: "3.9"
@@ -1063,7 +1063,7 @@ metadata:
   name: chartsnap-kong-default-validations
   labels:
     app.kubernetes.io/name: kong
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
     app.kubernetes.io/instance: "chartsnap"
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "3.9"
@@ -1086,6 +1086,10 @@ webhooks:
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
@@ -1109,14 +1113,14 @@ webhooks:
   name: secrets.plugins.validation.ingress-controller.konghq.com
   objectSelector:
     matchExpressions:
-    - key: owner
-      operator: NotIn
-      values:
-      - helm
     - key: "konghq.com/credential"
       operator: "NotIn"
       values:
       - "konnect"
+    - key: owner
+      operator: NotIn
+      values:
+      - helm
   rules:
   - apiGroups:
     - ""
diff --git a/charts/kong/ci/__snapshots__/single-image-default-values.snap b/charts/kong/ci/__snapshots__/single-image-default-values.snap
index 7d69fd538..298f6ec58 100644
--- a/charts/kong/ci/__snapshots__/single-image-default-values.snap
+++ b/charts/kong/ci/__snapshots__/single-image-default-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -21,7 +21,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-ca-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -50,7 +50,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 rules:
   - apiGroups:
@@ -498,7 +498,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -517,7 +517,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 rules:
@@ -581,7 +581,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 roleRef:
@@ -601,7 +601,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook
   namespace: default
 spec:
@@ -616,7 +616,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -626,7 +626,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-metrics
   namespace: default
 spec:
@@ -645,7 +645,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -655,7 +655,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -683,7 +683,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -711,7 +711,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -735,7 +735,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -1045,7 +1045,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default-validations
 webhooks:
   - admissionReviewVersions:
@@ -1066,6 +1066,10 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
@@ -1089,14 +1093,14 @@ webhooks:
     name: secrets.plugins.validation.ingress-controller.konghq.com
     objectSelector:
       matchExpressions:
-        - key: owner
-          operator: NotIn
-          values:
-            - helm
         - key: konghq.com/credential
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
diff --git a/charts/kong/ci/__snapshots__/test-enterprise-version-3.4-values.snap b/charts/kong/ci/__snapshots__/test-enterprise-version-3.4-values.snap
index 9b2149d56..7bdb170b7 100644
--- a/charts/kong/ci/__snapshots__/test-enterprise-version-3.4-values.snap
+++ b/charts/kong/ci/__snapshots__/test-enterprise-version-3.4-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.4"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -18,7 +18,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.4"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -46,7 +46,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.4"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -74,7 +74,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.4"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -98,7 +98,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.4"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.4"
     spec:
       automountServiceAccountToken: false
diff --git a/charts/kong/ci/__snapshots__/test1-values.snap b/charts/kong/ci/__snapshots__/test1-values.snap
index e38efadc5..743dab16d 100644
--- a/charts/kong/ci/__snapshots__/test1-values.snap
+++ b/charts/kong/ci/__snapshots__/test1-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -21,7 +21,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-ca-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -50,7 +50,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 rules:
   - apiGroups:
@@ -498,7 +498,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -517,7 +517,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 rules:
@@ -581,7 +581,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 roleRef:
@@ -601,7 +601,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook
   namespace: default
 spec:
@@ -616,7 +616,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -626,7 +626,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-metrics
   namespace: default
 spec:
@@ -645,7 +645,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -655,7 +655,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -683,7 +683,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -711,7 +711,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -735,7 +735,7 @@ spec:
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
         environment: test
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -1082,7 +1082,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -1108,7 +1108,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -1132,7 +1132,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default-validations
 webhooks:
   - admissionReviewVersions:
@@ -1153,6 +1153,10 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
@@ -1176,14 +1180,14 @@ webhooks:
     name: secrets.plugins.validation.ingress-controller.konghq.com
     objectSelector:
       matchExpressions:
-        - key: owner
-          operator: NotIn
-          values:
-            - helm
         - key: konghq.com/credential
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
diff --git a/charts/kong/ci/__snapshots__/test2-values.snap b/charts/kong/ci/__snapshots__/test2-values.snap
index 8576533f8..69a28a11d 100644
--- a/charts/kong/ci/__snapshots__/test2-values.snap
+++ b/charts/kong/ci/__snapshots__/test2-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -21,7 +21,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-ca-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -57,7 +57,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 rules:
   - apiGroups:
@@ -155,7 +155,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -174,7 +174,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 rules:
@@ -238,7 +238,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default
   namespace: default
 rules:
@@ -601,7 +601,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-kong-test
   namespace: kong-test
 rules:
@@ -964,7 +964,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 roleRef:
@@ -984,7 +984,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default
   namespace: default
 roleRef:
@@ -1004,7 +1004,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-kong-test
   namespace: kong-test
 roleRef:
@@ -1024,7 +1024,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook
   namespace: default
 spec:
@@ -1039,7 +1039,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -1049,7 +1049,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-metrics
   namespace: default
 spec:
@@ -1068,7 +1068,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -1078,7 +1078,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -1106,7 +1106,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -1142,7 +1142,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -1171,7 +1171,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -1521,7 +1521,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -1545,7 +1545,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default-validations
 webhooks:
   - admissionReviewVersions:
@@ -1566,6 +1566,10 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
@@ -1596,6 +1600,10 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
diff --git a/charts/kong/ci/__snapshots__/test3-values.snap b/charts/kong/ci/__snapshots__/test3-values.snap
index 67009035c..e4868a793 100644
--- a/charts/kong/ci/__snapshots__/test3-values.snap
+++ b/charts/kong/ci/__snapshots__/test3-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -28,7 +28,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-custom-dbless-config
   namespace: default
 ---
@@ -40,7 +40,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -68,7 +68,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -96,7 +96,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -121,7 +121,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
diff --git a/charts/kong/ci/__snapshots__/test4-values.snap b/charts/kong/ci/__snapshots__/test4-values.snap
index a7962c768..ffa79150f 100644
--- a/charts/kong/ci/__snapshots__/test4-values.snap
+++ b/charts/kong/ci/__snapshots__/test4-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -28,7 +28,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-custom-dbless-config
   namespace: default
 ---
@@ -40,7 +40,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -68,7 +68,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -104,7 +104,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -129,7 +129,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -371,7 +371,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
diff --git a/charts/kong/ci/__snapshots__/test5-values.snap b/charts/kong/ci/__snapshots__/test5-values.snap
index 69582d987..5fce638b5 100644
--- a/charts/kong/ci/__snapshots__/test5-values.snap
+++ b/charts/kong/ci/__snapshots__/test5-values.snap
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 ---
@@ -36,7 +36,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-ca-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -52,7 +52,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook-keypair
   namespace: default
 type: kubernetes.io/tls
@@ -71,7 +71,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-bash-wait-for-postgres
   namespace: default
 ---
@@ -83,7 +83,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 rules:
   - apiGroups:
@@ -531,7 +531,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -550,7 +550,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 rules:
@@ -614,7 +614,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 roleRef:
@@ -684,7 +684,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-validation-webhook
   namespace: default
 spec:
@@ -699,7 +699,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -709,7 +709,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-metrics
   namespace: default
 spec:
@@ -728,7 +728,7 @@ spec:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
 ---
 apiVersion: v1
 kind: Service
@@ -738,7 +738,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-manager
   namespace: default
 spec:
@@ -766,7 +766,7 @@ metadata:
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
     enable-metrics: "true"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -794,7 +794,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong
   namespace: default
 spec:
@@ -823,7 +823,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
         version: "3.9"
     spec:
       automountServiceAccountToken: false
@@ -1423,7 +1423,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-init-migrations
   namespace: default
 spec:
@@ -1439,7 +1439,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
       name: kong-init-migrations
     spec:
       automountServiceAccountToken: false
@@ -1660,7 +1660,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-proxy
   namespace: default
 spec:
@@ -1684,7 +1684,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-default-validations
 webhooks:
   - admissionReviewVersions:
@@ -1705,6 +1705,10 @@ webhooks:
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
@@ -1728,14 +1732,14 @@ webhooks:
     name: secrets.plugins.validation.ingress-controller.konghq.com
     objectSelector:
       matchExpressions:
-        - key: owner
-          operator: NotIn
-          values:
-            - helm
         - key: konghq.com/credential
           operator: NotIn
           values:
             - konnect
+        - key: owner
+          operator: NotIn
+          values:
+            - helm
     rules:
       - apiGroups:
           - ""
@@ -1820,7 +1824,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-post-upgrade-migrations
   namespace: default
 spec:
@@ -1836,7 +1840,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
       name: kong-post-upgrade-migrations
     spec:
       automountServiceAccountToken: false
@@ -2063,7 +2067,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: kong
     app.kubernetes.io/version: "3.9"
-    helm.sh/chart: kong-3.0.2
+    helm.sh/chart: kong-3.1.0
   name: chartsnap-kong-pre-upgrade-migrations
   namespace: default
 spec:
@@ -2079,7 +2083,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: kong
         app.kubernetes.io/version: "3.9"
-        helm.sh/chart: kong-3.0.2
+        helm.sh/chart: kong-3.1.0
       name: kong-pre-upgrade-migrations
     spec:
       automountServiceAccountToken: false
diff --git a/charts/kong/ci/additional-proxy-services-values.yaml b/charts/kong/ci/additional-proxy-services-values.yaml
new file mode 100644
index 000000000..54eba1fa8
--- /dev/null
+++ b/charts/kong/ci/additional-proxy-services-values.yaml
@@ -0,0 +1,45 @@
+# Test additional proxy services feature
+# This creates a second proxy service (ClusterIP) alongside the primary proxy (LoadBalancer)
+# simulating the use case of external LB with proxy_protocol + internal ClusterIP without proxy_protocol
+
+proxy:
+  enabled: true
+  type: LoadBalancer
+  annotations:
+    service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
+  http:
+    enabled: true
+    servicePort: 80
+    containerPort: 8000
+    parameters:
+    - proxy_protocol
+  tls:
+    enabled: true
+    servicePort: 443
+    containerPort: 8443
+    parameters:
+    - http2
+    - proxy_protocol
+
+additionalProxies:
+  internal:
+    enabled: true
+    type: ClusterIP
+    annotations: {}
+    labels:
+      proxy-type: "internal"
+    http:
+      enabled: true
+      servicePort: 80
+      containerPort: 7000
+      parameters: []
+    tls:
+      enabled: true
+      servicePort: 443
+      containerPort: 7443
+      parameters:
+      - http2
+      appProtocol: ""
+    stream: []
+    ingress:
+      enabled: false
diff --git a/charts/kong/ci/admission-webhook-configuration.yaml b/charts/kong/ci/admission-webhook-configuration.yaml
index 28e849944..f3cf81104 100644
--- a/charts/kong/ci/admission-webhook-configuration.yaml
+++ b/charts/kong/ci/admission-webhook-configuration.yaml
@@ -5,6 +5,8 @@ ingressController:
     timeoutSeconds: 5
     filterSecrets: true
     objectSelector:
+      matchLabels:
+        app.kubernetes.io/instance: kong-test
       matchExpressions:
       - key: owner
         operator: NotIn
diff --git a/charts/kong/ci/admission-webhook-filtersecrets-false.yaml b/charts/kong/ci/admission-webhook-filtersecrets-false.yaml
new file mode 100644
index 000000000..3a7370ff0
--- /dev/null
+++ b/charts/kong/ci/admission-webhook-filtersecrets-false.yaml
@@ -0,0 +1,13 @@
+ingressController:
+  enabled: true
+  admissionWebhook:
+    enabled: true
+    filterSecrets: false
+    objectSelector:
+      matchLabels:
+        app.kubernetes.io/instance: kong-custom
+      matchExpressions:
+      - key: environment
+        operator: In
+        values:
+        - production
diff --git a/charts/kong/templates/_helpers.tpl b/charts/kong/templates/_helpers.tpl
index 3863e742e..4498f5ed6 100644
--- a/charts/kong/templates/_helpers.tpl
+++ b/charts/kong/templates/_helpers.tpl
@@ -306,7 +306,7 @@ Generic tool for creating KONG_PROXY_LISTEN, KONG_ADMIN_LISTEN, etc.
       */}}
       {{- $listenConfig := dict -}}
       {{- $listenConfig := merge $listenConfig .tls -}}
-      {{- $parameters := append .tls.parameters "ssl" -}}
+      {{- $parameters := append (default (list) .tls.parameters) "ssl" -}}
       {{- $_ := set $listenConfig "parameters" $parameters -}}
       {{- $addresses := (default $defaultAddrs .addresses) -}}
       {{- range $addresses -}}
@@ -1070,7 +1070,17 @@ the template that it itself is using form the above sections.
   {{- $_ := set $autoEnv "KONG_ADMIN_API_URI" (include "kong.ingress.serviceUrl" .Values.admin.ingress) -}}
 {{- end -}}
 
-{{- $_ := set $autoEnv "KONG_PROXY_LISTEN" (include "kong.listen" .Values.proxy) -}}
+{{- $proxyListenStrings := list -}}
+{{- $proxyListenStrings = append $proxyListenStrings (include "kong.listen" .Values.proxy) -}}
+{{- range $name, $svcConfig := .Values.additionalProxies -}}
+  {{- if $svcConfig.enabled -}}
+    {{- $additionalListen := (include "kong.listen" $svcConfig) -}}
+    {{- if (ne $additionalListen "off") -}}
+      {{- $proxyListenStrings = append $proxyListenStrings $additionalListen -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+{{- $_ := set $autoEnv "KONG_PROXY_LISTEN" ($proxyListenStrings | join ", ") -}}
 
 {{- $streamStrings := list -}}
 {{- if .Values.proxy.enabled -}}
@@ -1079,6 +1089,14 @@ the template that it itself is using form the above sections.
     {{- $streamStrings = (append $streamStrings $tcpStreamString) -}}
   {{- end -}}
 {{- end -}}
+{{- range $name, $svcConfig := .Values.additionalProxies -}}
+  {{- if $svcConfig.enabled -}}
+    {{- $additionalStream := (include "kong.streamListen" $svcConfig) -}}
+    {{- if (not (eq $additionalStream "")) -}}
+      {{- $streamStrings = (append $streamStrings $additionalStream) -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
 {{- if .Values.udpProxy.enabled -}}
   {{- $udpStreamString := (include "kong.streamListen" .Values.udpProxy) -}}
   {{- if (not (eq $udpStreamString "")) -}}
@@ -1094,7 +1112,17 @@ the template that it itself is using form the above sections.
 {{- $_ := set $autoEnv "KONG_STATUS_LISTEN" (include "kong.listen" .Values.status) -}}
 
 {{- if .Values.proxy.enabled -}}
-  {{- $_ := set $autoEnv "KONG_PORT_MAPS" (include "kong.port_maps" .Values.proxy) -}}
+  {{- $portMapStrings := list -}}
+  {{- $portMapStrings = append $portMapStrings (include "kong.port_maps" .Values.proxy) -}}
+  {{- range $name, $svcConfig := .Values.additionalProxies -}}
+    {{- if $svcConfig.enabled -}}
+      {{- $additionalPortMaps := (include "kong.port_maps" $svcConfig) -}}
+      {{- if (ne (len $additionalPortMaps) 0) -}}
+        {{- $portMapStrings = append $portMapStrings $additionalPortMaps -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+  {{- $_ := set $autoEnv "KONG_PORT_MAPS" ($portMapStrings | join ", ") -}}
 {{- end -}}
 
 {{- $_ := set $autoEnv "KONG_CLUSTER_LISTEN" (include "kong.listen" .Values.cluster) -}}
@@ -1925,3 +1953,18 @@ envFrom:
 {{- end -}}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Render the konnect exclusion expression and user-provided matchExpressions
+from admissionWebhook.objectSelector. These always appear together at the
+end of the matchExpressions list for secrets webhooks.
+*/}}
+{{- define "kong.admissionWebhook.objectSelector.konnectExclusionAndUserExpressions" -}}
+- key: "konghq.com/credential"
+  operator: "NotIn"
+  values:
+  - "konnect"
+{{- with .Values.ingressController.admissionWebhook.objectSelector.matchExpressions }}
+{{ toYaml . }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/kong/templates/admission-webhook.yaml b/charts/kong/templates/admission-webhook.yaml
index 2df3ded69..63e0dba23 100644
--- a/charts/kong/templates/admission-webhook.yaml
+++ b/charts/kong/templates/admission-webhook.yaml
@@ -64,14 +64,14 @@ webhooks:
   timeoutSeconds: {{ . }}
   {{- end }}
   objectSelector:
+    {{- with .Values.ingressController.admissionWebhook.objectSelector.matchLabels }}
+    matchLabels:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     matchExpressions:
     - key: "konghq.com/credential"
       operator: "Exists"
-    {{- /* Do not validate Konnect credentials, these are targeted for KGO */}}
-    - key: "konghq.com/credential"
-      operator: "NotIn"
-      values:
-      - "konnect"
+    {{- include "kong.admissionWebhook.objectSelector.konnectExclusionAndUserExpressions" . | nindent 4 }}
   rules:
   - apiGroups:
     - ""
@@ -108,26 +108,22 @@ webhooks:
   {{- end }}
   {{- if .Values.ingressController.admissionWebhook.filterSecrets }}
   objectSelector:
+    {{- with .Values.ingressController.admissionWebhook.objectSelector.matchLabels }}
+    matchLabels:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     matchExpressions:
     - key: "konghq.com/validate"
       operator: "Exists"
-    {{- /* Do not validate Konnect credentials, these are targeted for KGO */}}
-    - key: "konghq.com/credential"
-      operator: "NotIn"
-      values:
-      - "konnect"
+    {{- include "kong.admissionWebhook.objectSelector.konnectExclusionAndUserExpressions" . | nindent 4 }}
   {{- else }}
   objectSelector:
+    {{- with .Values.ingressController.admissionWebhook.objectSelector.matchLabels }}
+    matchLabels:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     matchExpressions:
-    - key: owner
-      operator: NotIn
-      values:
-      - helm
-    {{- /* Do not validate Konnect credentials, these are targeted for KGO */}}
-    - key: "konghq.com/credential"
-      operator: "NotIn"
-      values:
-      - "konnect"
+    {{- include "kong.admissionWebhook.objectSelector.konnectExclusionAndUserExpressions" . | nindent 4 }}
   {{- end }}
   rules:
   - apiGroups:
diff --git a/charts/kong/templates/deployment.yaml b/charts/kong/templates/deployment.yaml
index 6c082eeb8..05a6eca8b 100644
--- a/charts/kong/templates/deployment.yaml
+++ b/charts/kong/templates/deployment.yaml
@@ -196,6 +196,34 @@ spec:
           {{- end}}
           protocol: {{ .protocol }}
         {{- end }}
+        {{- range $name, $svcConfig := .Values.additionalProxies }}
+        {{- if $svcConfig.enabled }}
+        {{- if (and $svcConfig.http $svcConfig.http.enabled) }}
+        - name: {{ printf "px-%s" $name | trunc 15 | trimSuffix "-" }}
+          containerPort: {{ $svcConfig.http.containerPort }}
+          {{- if $svcConfig.http.hostPort }}
+          hostPort: {{ $svcConfig.http.hostPort }}
+          {{- end}}
+          protocol: TCP
+        {{- end }}
+        {{- if (and $svcConfig.tls $svcConfig.tls.enabled) }}
+        - name: {{ printf "px-%s-tls" $name | trunc 15 | trimSuffix "-" }}
+          containerPort: {{ $svcConfig.tls.containerPort }}
+          {{- if $svcConfig.tls.hostPort }}
+          hostPort: {{ $svcConfig.tls.hostPort }}
+          {{- end}}
+          protocol: TCP
+        {{- end }}
+        {{- range $svcConfig.stream }}
+        - name: {{ printf "pxs%s-%d" (ternary "u" "" (eq (default "TCP" .protocol) "UDP")) (int .containerPort) | trunc 15 | trimSuffix "-" }}
+          containerPort: {{ .containerPort }}
+          {{- if .hostPort }}
+          hostPort: {{ .hostPort }}
+          {{- end}}
+          protocol: {{ .protocol }}
+        {{- end }}
+        {{- end }}
+        {{- end }}
         {{- range .Values.udpProxy.stream }}
         - name: streamudp-{{ .containerPort }}
           containerPort: {{ .containerPort }}
diff --git a/charts/kong/templates/service-kong-proxy-additional.yaml b/charts/kong/templates/service-kong-proxy-additional.yaml
new file mode 100644
index 000000000..01c482336
--- /dev/null
+++ b/charts/kong/templates/service-kong-proxy-additional.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.deployment.kong.enabled }}
+{{- range $name, $svcConfig := .Values.additionalProxies }}
+{{- if $svcConfig.enabled }}
+{{- if or (and $svcConfig.http $svcConfig.http.enabled) (and $svcConfig.tls $svcConfig.tls.enabled) }}
+{{- $serviceConfig := dict -}}
+{{- $serviceConfig := merge $serviceConfig $svcConfig -}}
+{{- $fullName := (include "kong.fullname" $) -}}
+{{- $serviceNameMaxLength := sub 63 (add 1 (len $fullName)) -}}
+{{- if le $serviceNameMaxLength 0 -}}
+{{- $serviceNameMaxLength = 1 -}}
+{{- end -}}
+{{- $serviceNameMaxLength = int $serviceNameMaxLength -}}
+{{- $_ := set $serviceConfig "fullName" $fullName -}}
+{{- $_ := set $serviceConfig "namespace" (include "kong.namespace" $) -}}
+{{- $_ := set $serviceConfig "metaLabels" (include "kong.metaLabels" $) -}}
+{{- $_ := set $serviceConfig "selectorLabels" (include "kong.selectorLabels" $) -}}
+{{- $_ := set $serviceConfig "serviceName" (printf "proxy-%s" $name | trunc $serviceNameMaxLength | trimSuffix "-") }}
+---
+{{ include "kong.service" $serviceConfig }}
+{{- if (and $svcConfig.ingress $svcConfig.ingress.enabled) }}
+---
+{{ include "kong.ingress" $serviceConfig }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/kong/values.yaml b/charts/kong/values.yaml
index 556425224..7eac4085f 100644
--- a/charts/kong/values.yaml
+++ b/charts/kong/values.yaml
@@ -436,6 +436,54 @@ udpProxy:
     #   # "ssl" is required for SNI-based routes. It is not supported on versions <2.0
     #   parameters: []
 
+# --------------------------------------------------------------------------
+# Additional proxy services
+# --------------------------------------------------------------------------
+# Define additional proxy services for the Kong proxy. Each entry creates a
+# separate Kubernetes Service that routes to the same Kong proxy container.
+# This is useful when you need multiple network paths with different
+# configurations, for example:
+#   - An external LoadBalancer with proxy_protocol for AWS NLB traffic
+#   - An internal ClusterIP service without proxy_protocol for in-cluster access
+#
+# Each additional proxy adds its own listeners to KONG_PROXY_LISTEN and
+# KONG_PORT_MAPS automatically, and exposes the corresponding container ports
+# in the deployment.
+#
+# IMPORTANT: Use container ports that do not conflict with the primary proxy
+# ports (8000/8443) or any other Kong listener ports.
+additionalProxies: {}
+  # Example: an internal ClusterIP proxy without proxy_protocol
+  # internal:
+  #   enabled: true
+  #   type: ClusterIP
+  #   loadBalancerClass: ""
+  #   loadBalancerSourceRanges: []
+  #   nameOverride: ""
+  #   annotations: {}
+  #   labels: {}
+  #   http:
+  #     enabled: true
+  #     servicePort: 80
+  #     containerPort: 7000
+  #     parameters: []
+  #   tls:
+  #     enabled: true
+  #     servicePort: 443
+  #     containerPort: 7443
+  #     parameters:
+  #     - http2
+  #     appProtocol: ""
+  #   stream: []
+  #   ingress:
+  #     enabled: false
+  #     ingressClassName:
+  #     annotations: {}
+  #     labels: {}
+  #     hostname:
+  #     path: /
+  #     pathType: ImplementationSpecific
+
 # Custom Kong plugins can be loaded into Kong by mounting the plugin code
 # into the file-system of Kong container.
 # The plugin code should be present in ConfigMap or Secret inside the same
@@ -619,7 +667,11 @@ ingressController:
     #        values:
     #          - kube-system
     namespaceSelector: {}
-    # ObjectSelector specifies which objects to match against validations.kong.konghq.com webhook webhook
+    # objectSelector specifies label selectors applied to all admission webhooks.
+    # For the secrets webhooks (credentials and plugins), chart-required expressions
+    # (e.g. credential type filtering, konnect exclusion) are always included
+    # in addition to any expressions you specify here.
+    # This is useful for scoping webhooks per Kong instance in multi-instance clusters.
     objectSelector:
       matchExpressions:
       - key: owner