diff --git a/cluster-tutorials/configure_users_and_databases/postgres.yaml b/cluster-tutorials/configure_users_and_databases/postgres.yaml
index 2bc45fc..7abd1cd 100644
--- a/cluster-tutorials/configure_users_and_databases/postgres.yaml
+++ b/cluster-tutorials/configure_users_and_databases/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
   numberOfInstances: 1
   postgresql:
     version: '16'
diff --git a/cluster-tutorials/high-availability-cluster/ha-postgres.yaml b/cluster-tutorials/high-availability-cluster/ha-postgres.yaml
index 3f6f345..fde76ca 100644
--- a/cluster-tutorials/high-availability-cluster/ha-postgres.yaml
+++ b/cluster-tutorials/high-availability-cluster/ha-postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: ha-cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
   numberOfInstances: 2
   postgresql:
     version: '16'
diff --git a/cluster-tutorials/monitored_cluster/postgres.yaml b/cluster-tutorials/monitored_cluster/postgres.yaml
index 1eb2ae2..7030ace 100644
--- a/cluster-tutorials/monitored_cluster/postgres.yaml
+++ b/cluster-tutorials/monitored_cluster/postgres.yaml
@@ -5,7 +5,7 @@ metadata:
   labels: 
     cpo_monitoring_stack: 'true'
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
   numberOfInstances: 1
   postgresql:
     version: '16'
diff --git a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml
index 406b9f4..fd6705f 100644
--- a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml
+++ b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
- dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
   numberOfInstances: 1
   postgresql:
     version: '16'
diff --git a/cluster-tutorials/prepared_databases/postgres.yaml b/cluster-tutorials/prepared_databases/postgres.yaml
index 8159120..1d678e0 100644
--- a/cluster-tutorials/prepared_databases/postgres.yaml
+++ b/cluster-tutorials/prepared_databases/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
   numberOfInstances: 1
   postgresql:
     version: '16'
diff --git a/cluster-tutorials/single-cluster/postgres.yaml b/cluster-tutorials/single-cluster/postgres.yaml
index afde39a..1714974 100644
--- a/cluster-tutorials/single-cluster/postgres.yaml
+++ b/cluster-tutorials/single-cluster/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
   numberOfInstances: 1
   postgresql:
     version: '16'
diff --git a/setup/helm/operator/templates/operator-service-account-rbac-openshift.yaml b/setup/helm/operator/templates/operator-service-account-rbac-openshift.yaml
index 5905267..8005f3c 100644
--- a/setup/helm/operator/templates/operator-service-account-rbac-openshift.yaml
+++ b/setup/helm/operator/templates/operator-service-account-rbac-openshift.yaml
@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: postgres-operator
+  name: cpo-operator
   namespace: {{ .Values.operatorSettings.operator_namespace }}
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: postgres-operator
+  name: cpo-operator
 rules:
 # all verbs allowed for custom operator resources
 - apiGroups:
@@ -202,7 +202,7 @@ rules:
   verbs:
   - get
   - create
-# to create role bindings to the postgres-pod service account
+# to create role bindings to the cpo-pod service account
 - apiGroups:
   - rbac.authorization.k8s.io
   resources:
@@ -224,21 +224,21 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: postgres-operator
+  name: cpo-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: postgres-operator
+  name: cpo-operator
 subjects:
 - kind: ServiceAccount
-  name: postgres-operator
+  name: cpo-operator
   namespace: {{ .Values.operatorSettings.operator_namespace }}
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: postgres-pod
+  name: cpo-pod
 rules:
 # Patroni needs to watch and manage config maps
 - apiGroups:
diff --git a/setup/helm/operator/templates/postgres-operator.yaml b/setup/helm/operator/templates/postgres-operator.yaml
index 2115ba2..1226cb5 100644
--- a/setup/helm/operator/templates/postgres-operator.yaml
+++ b/setup/helm/operator/templates/postgres-operator.yaml
@@ -17,7 +17,7 @@ spec:
         name: postgres-operator
         cpo.cybertec.at/pod-type: postgres-operator
     spec:
-      serviceAccountName: postgres-operator
+      serviceAccountName: cpo-operator
       containers:
       - name: postgres-operator
         image: {{ .Values.operatorSettings.operatorImage }}
diff --git a/setup/helm/operator/templates/postgresql-operator-configuration.yaml b/setup/helm/operator/templates/postgresql-operator-configuration.yaml
index 4375a63..bb0ee12 100644
--- a/setup/helm/operator/templates/postgresql-operator-configuration.yaml
+++ b/setup/helm/operator/templates/postgresql-operator-configuration.yaml
@@ -97,7 +97,7 @@ configuration:
     # pod_priority_class_name: "postgres-pod-priority"
     pod_role_label: spilo-role
     # pod_service_account_definition: ""
-    pod_service_account_name: postgres-pod
+    pod_service_account_name: cpo-pod
     # pod_service_account_role_binding_definition: ""
     pod_terminate_grace_period: 5m
     secret_name_template: "{username}.{cluster}.credentials.{tprkind}.{tprgroup}"
diff --git a/setup/helm/operator/values.yaml b/setup/helm/operator/values.yaml
index 7a69349..7ea8f65 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-rc1'
+  operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:0.7.0-rc5'
   watched_namespace: '*'
   enable_pod_antiaffinity: 'true'
   operator_namespace: 'cpo'
diff --git a/setup/monitoring.tar.gz b/setup/monitoring.tar.gz
deleted file mode 100644
index 1cfd0f7..0000000
Binary files a/setup/monitoring.tar.gz and /dev/null differ