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 8005f3c..22a2fc3 100644
--- a/setup/helm/operator/templates/operator-service-account-rbac-openshift.yaml
+++ b/setup/helm/operator/templates/operator-service-account-rbac-openshift.yaml
@@ -35,20 +35,6 @@ rules:
   - get
   - list
   - watch
-# all verbs allowed for event streams (Zalando-internal feature)
-# - apiGroups:
-#   - zalando.org
-#   resources:
-#   - fabriceventstreams
-#   verbs:
-#   - create
-#   - delete
-#   - deletecollection
-#   - get
-#   - list
-#   - patch
-#   - update
-#   - watch
 # to create or get/update CRDs when starting up
 - apiGroups:
   - apiextensions.k8s.io
diff --git a/setup/helm/operator/templates/postgresql-operator-configuration.yaml b/setup/helm/operator/templates/postgresql-operator-configuration.yaml
index caa2a02..4e0cdd7 100644
--- a/setup/helm/operator/templates/postgresql-operator-configuration.yaml
+++ b/setup/helm/operator/templates/postgresql-operator-configuration.yaml
@@ -3,7 +3,7 @@ kind: OperatorConfiguration
 metadata:
   name: postgresql-operator-configuration
 configuration:
-  docker_image: docker.io/cybertecpostgresql/cybertec-pg-container:postgres-15.2-4
+  docker_image: {{ .Values.operatorSettings.postgresImage }}
   # enable_crd_registration: true
   # crd_categories:
   # - all
@@ -52,7 +52,7 @@ configuration:
     cluster_domain: cluster.local
     cluster_labels:
       application: cpo
-    cluster_name_label: cluster-name
+    cluster_name_label: cluster.cpo.opensource.cybertec.at/name
     inherited_labels:
     - cpo_monitoring_stack
     # custom_pod_annotations:
@@ -95,7 +95,7 @@ configuration:
     # pod_environment_secret: "my-custom-secret"
     pod_management_policy: "ordered_ready"
     # pod_priority_class_name: "postgres-pod-priority"
-    pod_role_label: spilo-role
+    pod_role_label: member.cpo.opensource.cybertec.at/role
     # pod_service_account_definition: ""
     pod_service_account_name: cpo-pod
     # pod_service_account_role_binding_definition: ""
diff --git a/setup/helm/operator/values.yaml b/setup/helm/operator/values.yaml
index ecee6d3..f58a968 100644
--- a/setup/helm/operator/values.yaml
+++ b/setup/helm/operator/values.yaml
@@ -16,6 +16,7 @@ imagePullSecretNames: []
 # Define the operator settings to add to the configmap
 operatorSettings:
   operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:v0.7.0-2-rc1'
+  postgresImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1'
   watched_namespace: '*'
   enable_pod_antiaffinity: 'true'
   operator_namespace: 'cpo'