diff --git a/.gitignore b/.gitignore
index af3191c..ec30f66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
 # exclude some folders
-setup/helm/configmap.yaml
 setup/monitoring
-setup/operator
-setup/monitoring.tar.gz
\ No newline at end of file
diff --git a/cluster-tutorials/configure_users_and_databases/postgres.yaml b/cluster-tutorials/configure_users_and_databases/postgres.yaml
index 7abd1cd..42778b6 100644
--- a/cluster-tutorials/configure_users_and_databases/postgres.yaml
+++ b/cluster-tutorials/configure_users_and_databases/postgres.yaml
@@ -3,12 +3,10 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1'
   numberOfInstances: 1
   postgresql:
     version: '16'
-    parameters:
-      password_encryption: "scram-sha-256"
   resources:
     limits:
       cpu: 500m
diff --git a/cluster-tutorials/high-availability-cluster/ha-postgres.yaml b/cluster-tutorials/high-availability-cluster/ha-postgres.yaml
index fde76ca..3f09934 100644
--- a/cluster-tutorials/high-availability-cluster/ha-postgres.yaml
+++ b/cluster-tutorials/high-availability-cluster/ha-postgres.yaml
@@ -3,12 +3,10 @@ kind: postgresql
 metadata:
   name: ha-cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1'
   numberOfInstances: 2
   postgresql:
     version: '16'
-    parameters:
-      password_encryption: "scram-sha-256"
   resources:
     limits:
       cpu: 500m
diff --git a/cluster-tutorials/monitored_cluster/postgres.yaml b/cluster-tutorials/monitored_cluster/postgres.yaml
index 7030ace..5b870ca 100644
--- a/cluster-tutorials/monitored_cluster/postgres.yaml
+++ b/cluster-tutorials/monitored_cluster/postgres.yaml
@@ -2,16 +2,11 @@ apiVersion: cpo.opensource.cybertec.at/v1
 kind: postgresql
 metadata:
   name: cluster-1
-  labels: 
-    cpo_monitoring_stack: 'true'
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1'
   numberOfInstances: 1
   postgresql:
     version: '16'
-    parameters:
-      shared_preload_libraries: 'pg_stat_statements,pgnodemx'
-      password_encryption: "scram-sha-256"
   resources:
     limits:
       cpu: 500m
@@ -23,26 +18,5 @@ spec:
   volume:
     size: 5Gi
     #storageClass: default-provisioner
-  sidecars:
-    - env:
-        - name: DATA_SOURCE_URI
-          value: 'localhost:5432/postgres?sslmode=disable'
-        - name: DATA_SOURCE_USER
-          valueFrom:
-            secretKeyRef:
-              key: username
-              name: cpo-exporter.cluster-1.credentials.postgresql.acid.zalan.do
-        - name: DATA_SOURCE_PASS
-          valueFrom:
-            secretKeyRef:
-              key: password
-              name: cpo-exporter.cluster-1.credentials.postgresql.acid.zalan.do
-      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:exporter-0.6.0-1'
-      name: postgres-exporter
-      ports:
-        - containerPort: 9187
-          name: http
-          protocol: TCP
-  users:
-    cpo_exporter:
-      - login
+  monitor:
+      image: docker.io/cybertecpostgresql/cybertec-pg-container:exporter-16.2-2-rc1
diff --git a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml
index fd6705f..d59c3c9 100644
--- a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml
+++ b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml
@@ -3,12 +3,10 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1'
   numberOfInstances: 1
   postgresql:
     version: '16'
-    parameters:
-      password_encryption: "scram-sha-256"
   resources:
       limits:
         cpu: 500m
@@ -27,8 +25,7 @@ spec:
           repo1-path: /YOUR_PATH_INSIDE_THE_BUCKET/repo1/
           repo1-retention-full: '7'
           repo1-retention-full-type: count
-        image: >-
-          docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-rocky9-16-13-1
+        image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.2-2-rc1
         repos:
           - endpoint: YOUR_S3_ENDPOINT
             name: repo1
diff --git a/cluster-tutorials/prepared_databases/postgres.yaml b/cluster-tutorials/prepared_databases/postgres.yaml
index 1d678e0..56dc9e9 100644
--- a/cluster-tutorials/prepared_databases/postgres.yaml
+++ b/cluster-tutorials/prepared_databases/postgres.yaml
@@ -3,12 +3,10 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1'
   numberOfInstances: 1
   postgresql:
     version: '16'
-    parameters:
-      password_encryption: "scram-sha-256"
   preparedDatabases:
     bar:
       defaultUsers: true
diff --git a/cluster-tutorials/single-cluster/postgres.yaml b/cluster-tutorials/single-cluster/postgres.yaml
index 1714974..7315789 100644
--- a/cluster-tutorials/single-cluster/postgres.yaml
+++ b/cluster-tutorials/single-cluster/postgres.yaml
@@ -3,12 +3,10 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1'
   numberOfInstances: 1
   postgresql:
     version: '16'
-    parameters:
-      password_encryption: "scram-sha-256"
   resources:
     limits:
       cpu: 500m
diff --git a/setup/helm/operator/crds/postgresql.crd.yaml b/setup/helm/operator/crds/postgresql.crd.yaml
index 385eea7..eb86c6b 100644
--- a/setup/helm/operator/crds/postgresql.crd.yaml
+++ b/setup/helm/operator/crds/postgresql.crd.yaml
@@ -340,6 +340,12 @@ spec:
                 type: object
                 additionalProperties:
                   type: string
+              monitor:
+                nullable: true
+                properties:
+                  image:
+                    type: string
+                type: object
               nodeAffinity:
                 type: object
                 properties:
diff --git a/setup/helm/operator/templates/NOTES.txt b/setup/helm/operator/templates/NOTES.txt
index 2ffd4da..9725888 100644
--- a/setup/helm/operator/templates/NOTES.txt
+++ b/setup/helm/operator/templates/NOTES.txt
@@ -13,4 +13,4 @@ Github project:         https://github.com/cybertec-postgresql/postgres-pg-opera
 Documentation:          https://cybertec-postgresql.github.io/CYBERTEC-pg-operator/
 
 Apache License Version 2.0
-Copyright 2022-2023 CYBERTEC PostgreSQL International GmbH
+Copyright 2022-2024 CYBERTEC PostgreSQL International GmbH
diff --git a/setup/helm/operator/templates/infrastructure_role.yaml b/setup/helm/operator/templates/infrastructure_role.yaml
deleted file mode 100644
index fafd2b1..0000000
--- a/setup/helm/operator/templates/infrastructure_role.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: cpo-monitoring-role
-  namespace: {{ .Values.operatorSettings.operator_namespace }}
-type: Opaque
-stringData:
-  user: postgres_exporter
-  password: password
diff --git a/setup/helm/operator/templates/postgresql-operator-configuration.yaml b/setup/helm/operator/templates/postgresql-operator-configuration.yaml
index bb0ee12..caa2a02 100644
--- a/setup/helm/operator/templates/postgresql-operator-configuration.yaml
+++ b/setup/helm/operator/templates/postgresql-operator-configuration.yaml
@@ -45,13 +45,13 @@ configuration:
     # major_version_upgrade_team_allow_list:
     # - acid
     minimal_major_version: "13"
-    target_major_version: "15"
+    target_major_version: "16"
   kubernetes:
     # additional_pod_capabilities:
     # - "SYS_NICE"
     cluster_domain: cluster.local
     cluster_labels:
-      application: spilo
+      application: cpo
     cluster_name_label: cluster-name
     inherited_labels:
     - cpo_monitoring_stack
@@ -71,11 +71,11 @@ configuration:
     enable_sidecars: true
     # ignored_annotations:
     # - k8s.v1.cni.cncf.io/network-status
-    infrastructure_roles_secrets:
-    - secretname: "cpo-monitoring-role"
-      userkey: "user"
-      passwordkey: "password"
-      rolekey: "inrole"
+    # infrastructure_roles_secrets:
+    # - secretname: "cpo-monitoring-role"
+    #   userkey: "user"
+    #   passwordkey: "password"
+    #   rolekey: "inrole"
     # - secretname: "other-infrastructure-role"
     #   userkey: "other-user-key"
     #   passwordkey: "other-password-key"
diff --git a/setup/helm/operator/values.yaml b/setup/helm/operator/values.yaml
index 7ea8f65..ecee6d3 100644
--- a/setup/helm/operator/values.yaml
+++ b/setup/helm/operator/values.yaml
@@ -15,7 +15,7 @@ imagePullSecretNames: []
 
 # Define the operator settings to add to the configmap
 operatorSettings:
-  operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:0.7.0-rc5'
+  operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:v0.7.0-2-rc1'
   watched_namespace: '*'
   enable_pod_antiaffinity: 'true'
   operator_namespace: 'cpo'