diff --git a/.gitignore b/.gitignore
index ec30f66..4d0f742 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 # exclude some folders
 setup/monitoring
+setup/helm/pgcluster
diff --git a/cluster-tutorials/configure_users_and_databases/postgres.yaml b/cluster-tutorials/configure_users_and_databases/postgres.yaml
index 9cfd720..f525aeb 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-16.3-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
@@ -23,5 +23,5 @@ spec:
     - createdb
     appl_user:
     - login
-  databases;
+  databases:
     app_db: appl_user
diff --git a/cluster-tutorials/high-availability-cluster/ha-postgres.yaml b/cluster-tutorials/high-availability-cluster/ha-postgres.yaml
index eaaf5fc..4901424 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-16.3-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 2
   postgresql:
     version: '16'
diff --git a/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml b/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml
index 056e9d1..5cf5947 100644
--- a/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml
+++ b/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: ha-cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
@@ -15,7 +15,7 @@ spec:
       cpu: 500m
       memory: 500Mi
   connectionPooler:
-    dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbouncer-1.22-1'
+    dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbouncer-1.23-1'
     mode: transaction
     numberOfInstances: 2
     resources:
diff --git a/cluster-tutorials/monitored_cluster/postgres.yaml b/cluster-tutorials/monitored_cluster/postgres.yaml
index 4a3b2c1..fd38924 100644
--- a/cluster-tutorials/monitored_cluster/postgres.yaml
+++ b/cluster-tutorials/monitored_cluster/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
@@ -19,4 +19,4 @@ spec:
     size: 5Gi
     #storageClass: default-provisioner
   monitor:
-      image: docker.io/cybertecpostgresql/cybertec-pg-container:exporter-16.3-1'
+      image: docker.io/cybertecpostgresql/cybertec-pg-container:exporter-16.4-1'
diff --git a/cluster-tutorials/pgbackrest_with_gcs/gcs.conf b/cluster-tutorials/pgbackrest_with_gcs/gcs.conf
new file mode 100644
index 0000000..cd10607
--- /dev/null
+++ b/cluster-tutorials/pgbackrest_with_gcs/gcs.conf
@@ -0,0 +1,2 @@
+[global]
+repo1-cipher-pass=YOUR_ENCRYPTION_PASSPHRASE
\ No newline at end of file
diff --git a/cluster-tutorials/pgbackrest_with_gcs/kustomization.yaml b/cluster-tutorials/pgbackrest_with_gcs/kustomization.yaml
new file mode 100644
index 0000000..4c9da9c
--- /dev/null
+++ b/cluster-tutorials/pgbackrest_with_gcs/kustomization.yaml
@@ -0,0 +1,11 @@
+secretGenerator:
+- name: cluster-1-gcs-credentials
+  files:
+  - gcs.conf
+  - gcs.json
+
+generatorOptions:
+  disableNameSuffixHash: true
+
+resources:
+- postgres.yaml
diff --git a/cluster-tutorials/pgbackrest_with_gcs/postgres.yaml b/cluster-tutorials/pgbackrest_with_gcs/postgres.yaml
index a5df257..23e2698 100644
--- a/cluster-tutorials/pgbackrest_with_gcs/postgres.yaml
+++ b/cluster-tutorials/pgbackrest_with_gcs/postgres.yaml
@@ -3,33 +3,34 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
-    version: '16'
+    version: '15'
   resources:
     limits:
-      cpu: 500m
+      cpu: 100m
       memory: 500Mi
     requests:
-      cpu: 500m
+      cpu: 100m
       memory: 500Mi
   teamId: acid
   volume:
     size: 5Gi
   backup:
     pgbackrest:
+      configuration:
+        secret: cluster-1-gcs-credentials
       global:
-        repo1-gcs-key: /var/secrets/google/key.json
-        repo1-gcs-key-type: service
         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-16.3-1
+      image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.4-1'
       repos:
-        - endpoint: YOUR_GCS_ENDPOINT
-          name: repo1
-          resource: YOUR_BUCKET_NAME
+        - name: repo1
+          resource: cpo-bucket-1
+          key: gcs.json
+          keyType: service
           schedule:
             full: 30 2 * * *
-          storage: gcs
\ No newline at end of file
+          storage: gcs
diff --git a/cluster-tutorials/pgbackrest_with_pvc/postgres.yaml b/cluster-tutorials/pgbackrest_with_pvc/postgres.yaml
index 2e29f2a..2161af7 100644
--- a/cluster-tutorials/pgbackrest_with_pvc/postgres.yaml
+++ b/cluster-tutorials/pgbackrest_with_pvc/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
@@ -24,7 +24,7 @@ spec:
       global:
         repo1-retention-full: '7'
         repo1-retention-full-type: count
-      image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.3-1
+      image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.4-1'
       repos:
         - name: repo1
           schedule:
diff --git a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml
index 20abd32..cf95069 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-16.3-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
@@ -25,7 +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-16.3-1
+      image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.4-1'
       repos:
         - endpoint: YOUR_S3_ENDPOINT
           name: repo1
diff --git a/cluster-tutorials/prepared_databases/postgres.yaml b/cluster-tutorials/prepared_databases/postgres.yaml
index f8cb6ad..a7f02f4 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-16.3-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
diff --git a/cluster-tutorials/public-beta-pg17/postgres.yaml b/cluster-tutorials/public-beta-pg17/postgres.yaml
index 6b712b9..29684ea 100644
--- a/cluster-tutorials/public-beta-pg17/postgres.yaml
+++ b/cluster-tutorials/public-beta-pg17/postgres.yaml
@@ -7,6 +7,8 @@ spec:
   numberOfInstances: 1
   postgresql:
     version: '17'
+    parameters:
+      shared_preload_libraries: 'pg_stat_statements'
   resources:
     limits:
       cpu: 500m
diff --git a/cluster-tutorials/restore/postgres.yaml b/cluster-tutorials/restore/postgres.yaml
index 641af3a..41534ad 100644
--- a/cluster-tutorials/restore/postgres.yaml
+++ b/cluster-tutorials/restore/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
@@ -24,7 +24,7 @@ spec:
       global:
         repo1-retention-full: '7'
         repo1-retention-full-type: count
-      image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.3-1
+      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.4-1'
       repos:
         - name: repo1
           schedule:
diff --git a/cluster-tutorials/single-cluster/postgres.yaml b/cluster-tutorials/single-cluster/postgres.yaml
index a9d5f29..1c25d13 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-16.3-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
   numberOfInstances: 1
   postgresql:
     version: '16'
diff --git a/setup/helm/operator/values.yaml b/setup/helm/operator/values.yaml
index f70b384..255395f 100644
--- a/setup/helm/operator/values.yaml
+++ b/setup/helm/operator/values.yaml
@@ -15,9 +15,9 @@ imagePullSecretNames: []
 
 # Define the operator settings to add to the configmap
 operatorSettings:
-  operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator-dev:v0.7.0-2'
-  postgresImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
-  poolerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbouncer-1.22-1'
+  operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:v0.7.1-1'
+  postgresImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.4-1'
+  poolerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbouncer-1.23-1'
   watched_namespace: '*'
   enable_pod_antiaffinity: 'true'
   operator_namespace: 'cpo'