diff --git a/clusters/cl01tl/manifests/grafana-operator/ClusterRole-grafana-operator.yaml b/clusters/cl01tl/manifests/grafana-operator/ClusterRole-grafana-operator.yaml
index a6c943d53..5b13d2621 100644
--- a/clusters/cl01tl/manifests/grafana-operator/ClusterRole-grafana-operator.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/ClusterRole-grafana-operator.yaml
@@ -3,10 +3,10 @@ kind: ClusterRole
 metadata:
   name: grafana-operator
   labels:
-    helm.sh/chart: grafana-operator-5.22.2
+    helm.sh/chart: grafana-operator-5.23.0
     app.kubernetes.io/name: grafana-operator
     app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/version: "v5.22.2"
+    app.kubernetes.io/version: "v5.23.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: grafana-operator
     app.kubernetes.io/component: operator
diff --git a/clusters/cl01tl/manifests/grafana-operator/ClusterRoleBinding-grafana-operator.yaml b/clusters/cl01tl/manifests/grafana-operator/ClusterRoleBinding-grafana-operator.yaml
index 4a08c482b..3ae69491c 100644
--- a/clusters/cl01tl/manifests/grafana-operator/ClusterRoleBinding-grafana-operator.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/ClusterRoleBinding-grafana-operator.yaml
@@ -3,10 +3,10 @@ kind: ClusterRoleBinding
 metadata:
   name: grafana-operator
   labels:
-    helm.sh/chart: grafana-operator-5.22.2
+    helm.sh/chart: grafana-operator-5.23.0
     app.kubernetes.io/name: grafana-operator
     app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/version: "v5.22.2"
+    app.kubernetes.io/version: "v5.23.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: grafana-operator
     app.kubernetes.io/component: operator
diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanaalertrulegroups.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanaalertrulegroups.grafana.integreatly.org.yaml
index 2da920c49..a5e589a0b 100644
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanaalertrulegroups.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanaalertrulegroups.grafana.integreatly.org.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.1
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: grafanaalertrulegroups.grafana.integreatly.org
 spec:
   group: grafana.integreatly.org
diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanacontactpoints.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanacontactpoints.grafana.integreatly.org.yaml
index 74a4095a4..4b8417d36 100644
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanacontactpoints.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanacontactpoints.grafana.integreatly.org.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.1
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: grafanacontactpoints.grafana.integreatly.org
 spec:
   group: grafana.integreatly.org
diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadashboards.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadashboards.grafana.integreatly.org.yaml
index db1778f37..d48fa8700 100644
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadashboards.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadashboards.grafana.integreatly.org.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.1
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: grafanadashboards.grafana.integreatly.org
 spec:
   group: grafana.integreatly.org
diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadatasources.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadatasources.grafana.integreatly.org.yaml
index 3bf4ca26f..a46d2b0ef 100644
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadatasources.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadatasources.grafana.integreatly.org.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.1
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: grafanadatasources.grafana.integreatly.org
 spec:
   group: grafana.integreatly.org
diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanafolders.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanafolders.grafana.integreatly.org.yaml
index 95d19bdb6..0d0ec996b 100644
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanafolders.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanafolders.grafana.integreatly.org.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.1
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: grafanafolders.grafana.integreatly.org
 spec:
   group: grafana.integreatly.org
diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanalibrarypanels.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanalibrarypanels.grafana.integreatly.org.yaml
index e352f2092..670714a34 100644
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanalibrarypanels.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanalibrarypanels.grafana.integreatly.org.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.1
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: grafanalibrarypanels.grafana.integreatly.org
 spec:
   group: grafana.integreatly.org
diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamanifests.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamanifests.grafana.integreatly.org.yaml
index ba74c70d2..dfcbaf700 100644
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamanifests.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamanifests.grafana.integreatly.org.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.1
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: grafanamanifests.grafana.integreatly.org
 spec:
   group: grafana.integreatly.org
diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamutetimings.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamutetimings.grafana.integreatly.org.yaml
index b0f8f388c..ab60776b3 100644
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamutetimings.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamutetimings.grafana.integreatly.org.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.1
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: grafanamutetimings.grafana.integreatly.org
 spec:
   group: grafana.integreatly.org
diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicies.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicies.grafana.integreatly.org.yaml
index f4cddb9a6..9f821bcdc 100644
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicies.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicies.grafana.integreatly.org.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.1
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: grafananotificationpolicies.grafana.integreatly.org
 spec:
   group: grafana.integreatly.org
@@ -141,10 +141,10 @@ spec:
                       items:
                         properties:
                           isEqual:
-                            description: is equal
+                            description: 'Deprecated: Does nothing and is not exported by Grafana'
                             type: boolean
                           isRegex:
-                            description: is regex
+                            description: 'Deprecated: Does nothing and is not exported by Grafana'
                             type: boolean
                           name:
                             description: name
diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicyroutes.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicyroutes.grafana.integreatly.org.yaml
index 6974b3d5a..ea41e3b8d 100644
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicyroutes.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicyroutes.grafana.integreatly.org.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.1
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: grafananotificationpolicyroutes.grafana.integreatly.org
 spec:
   group: grafana.integreatly.org
@@ -69,10 +69,10 @@ spec:
                   items:
                     properties:
                       isEqual:
-                        description: is equal
+                        description: 'Deprecated: Does nothing and is not exported by Grafana'
                         type: boolean
                       isRegex:
-                        description: is regex
+                        description: 'Deprecated: Does nothing and is not exported by Grafana'
                         type: boolean
                       name:
                         description: name
diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationtemplates.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationtemplates.grafana.integreatly.org.yaml
index ef43055f4..030ac89bd 100644
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationtemplates.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationtemplates.grafana.integreatly.org.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.1
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: grafananotificationtemplates.grafana.integreatly.org
 spec:
   group: grafana.integreatly.org
diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanas.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanas.grafana.integreatly.org.yaml
index a902c26e4..34508a5cf 100644
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanas.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanas.grafana.integreatly.org.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.1
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: grafanas.grafana.integreatly.org
 spec:
   group: grafana.integreatly.org
@@ -3996,7 +3996,6 @@ spec:
                       pattern: ^https?://.+$
                       type: string
                   required:
-                    - tenantNamespace
                     - url
                   type: object
                 httpRoute:
@@ -8886,7 +8885,7 @@ spec:
                   description: |-
                     Version sets the tag of the default image: docker.io/grafana/grafana.
                     Allows full image refs with/without sha256checksum: "registry/repo/image:tag@sha"
-                    default: 12.4.1
+                    default: 13.0.1
                   type: string
               type: object
             status:
diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanaserviceaccounts.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanaserviceaccounts.grafana.integreatly.org.yaml
index b46d7d050..b21a2582c 100644
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanaserviceaccounts.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanaserviceaccounts.grafana.integreatly.org.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.1
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: grafanaserviceaccounts.grafana.integreatly.org
 spec:
   group: grafana.integreatly.org
diff --git a/clusters/cl01tl/manifests/grafana-operator/Deployment-grafana-operator.yaml b/clusters/cl01tl/manifests/grafana-operator/Deployment-grafana-operator.yaml
index aadbf25a5..3b4a7358e 100644
--- a/clusters/cl01tl/manifests/grafana-operator/Deployment-grafana-operator.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/Deployment-grafana-operator.yaml
@@ -4,10 +4,10 @@ metadata:
   name: grafana-operator
   namespace: grafana-operator
   labels:
-    helm.sh/chart: grafana-operator-5.22.2
+    helm.sh/chart: grafana-operator-5.23.0
     app.kubernetes.io/name: grafana-operator
     app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/version: "v5.22.2"
+    app.kubernetes.io/version: "v5.23.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: grafana-operator
     app.kubernetes.io/component: operator
@@ -20,10 +20,10 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: grafana-operator-5.22.2
+        helm.sh/chart: grafana-operator-5.23.0
         app.kubernetes.io/name: grafana-operator
         app.kubernetes.io/instance: grafana-operator
-        app.kubernetes.io/version: "v5.22.2"
+        app.kubernetes.io/version: "v5.23.0"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: grafana-operator
         app.kubernetes.io/component: operator
@@ -38,7 +38,7 @@ spec:
                 - ALL
             readOnlyRootFilesystem: true
             runAsNonRoot: true
-          image: "ghcr.io/grafana/grafana-operator:v5.22.2@sha256:d45fc24e8f43d83286d81625ee8d919d0fc88255a6500b63f68d7966a4f9e9af"
+          image: "ghcr.io/grafana/grafana-operator:v5.23.0@sha256:3abeaccdf54e9e02c2f4b6215be594c8f78b94a866961ada7f92b677bf33c9b4"
           imagePullPolicy: IfNotPresent
           env:
             - name: WATCH_NAMESPACE
diff --git a/clusters/cl01tl/manifests/grafana-operator/Role-grafana-operator-leases.yaml b/clusters/cl01tl/manifests/grafana-operator/Role-grafana-operator-leases.yaml
index b6c4214ec..d1c5eab66 100644
--- a/clusters/cl01tl/manifests/grafana-operator/Role-grafana-operator-leases.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/Role-grafana-operator-leases.yaml
@@ -4,10 +4,10 @@ metadata:
   namespace: grafana-operator
   name: grafana-operator-leases
   labels:
-    helm.sh/chart: grafana-operator-5.22.2
+    helm.sh/chart: grafana-operator-5.23.0
     app.kubernetes.io/name: grafana-operator
     app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/version: "v5.22.2"
+    app.kubernetes.io/version: "v5.23.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: grafana-operator
     app.kubernetes.io/component: operator
diff --git a/clusters/cl01tl/manifests/grafana-operator/RoleBinding-grafana-operator-leases.yaml b/clusters/cl01tl/manifests/grafana-operator/RoleBinding-grafana-operator-leases.yaml
index 6450172ae..fb548acbb 100644
--- a/clusters/cl01tl/manifests/grafana-operator/RoleBinding-grafana-operator-leases.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/RoleBinding-grafana-operator-leases.yaml
@@ -4,10 +4,10 @@ metadata:
   name: grafana-operator-leases
   namespace: grafana-operator
   labels:
-    helm.sh/chart: grafana-operator-5.22.2
+    helm.sh/chart: grafana-operator-5.23.0
     app.kubernetes.io/name: grafana-operator
     app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/version: "v5.22.2"
+    app.kubernetes.io/version: "v5.23.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: grafana-operator
     app.kubernetes.io/component: operator
diff --git a/clusters/cl01tl/manifests/grafana-operator/Service-grafana-operator-metrics-service.yaml b/clusters/cl01tl/manifests/grafana-operator/Service-grafana-operator-metrics-service.yaml
index eac84adb0..392acfa64 100644
--- a/clusters/cl01tl/manifests/grafana-operator/Service-grafana-operator-metrics-service.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/Service-grafana-operator-metrics-service.yaml
@@ -4,10 +4,10 @@ metadata:
   name: grafana-operator-metrics-service
   namespace: grafana-operator
   labels:
-    helm.sh/chart: grafana-operator-5.22.2
+    helm.sh/chart: grafana-operator-5.23.0
     app.kubernetes.io/name: grafana-operator
     app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/version: "v5.22.2"
+    app.kubernetes.io/version: "v5.23.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: grafana-operator
     app.kubernetes.io/component: operator
diff --git a/clusters/cl01tl/manifests/grafana-operator/ServiceAccount-grafana-operator.yaml b/clusters/cl01tl/manifests/grafana-operator/ServiceAccount-grafana-operator.yaml
index 84a30f910..b4badfc5b 100644
--- a/clusters/cl01tl/manifests/grafana-operator/ServiceAccount-grafana-operator.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/ServiceAccount-grafana-operator.yaml
@@ -4,10 +4,10 @@ metadata:
   name: grafana-operator
   namespace: grafana-operator
   labels:
-    helm.sh/chart: grafana-operator-5.22.2
+    helm.sh/chart: grafana-operator-5.23.0
     app.kubernetes.io/name: grafana-operator
     app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/version: "v5.22.2"
+    app.kubernetes.io/version: "v5.23.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: grafana-operator
     app.kubernetes.io/component: operator
diff --git a/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-grafana-operator.yaml b/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-grafana-operator.yaml
index 8f787822b..feebe114f 100644
--- a/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-grafana-operator.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-grafana-operator.yaml
@@ -4,10 +4,10 @@ metadata:
   name: grafana-operator
   namespace: grafana-operator
   labels:
-    helm.sh/chart: grafana-operator-5.22.2
+    helm.sh/chart: grafana-operator-5.23.0
     app.kubernetes.io/name: grafana-operator
     app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/version: "v5.22.2"
+    app.kubernetes.io/version: "v5.23.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: grafana-operator
     app.kubernetes.io/component: operator