diff --git a/clone_with_pvc/kustomization.yaml b/clone_with_pvc/kustomization.yaml
new file mode 100644
index 0000000..d097741
--- /dev/null
+++ b/clone_with_pvc/kustomization.yaml
@@ -0,0 +1,10 @@
+secretGenerator:
+- name: cluster-1-pvc-configuration
+  files:
+  - pvc.configuration
+
+generatorOptions:
+  disableNameSuffixHash: true
+
+resources:
+- postgres.yaml
diff --git a/clone_with_pvc/postgres.yaml b/clone_with_pvc/postgres.yaml
new file mode 100644
index 0000000..5a09105
--- /dev/null
+++ b/clone_with_pvc/postgres.yaml
@@ -0,0 +1,41 @@
+apiVersion: cpo.opensource.cybertec.at/v1
+kind: postgresql
+metadata:
+  name: cluster-1-clone
+spec:
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.2-4'
+  numberOfInstances: 1
+  postgresql:
+    version: '17'
+  resources:
+    limits:
+      cpu: 500m
+      memory: 500Mi
+    requests:
+      cpu: 500m
+      memory: 500Mi
+  teamId: acid
+  volume:
+    size: 5Gi
+  backup:
+    pgbackrest:
+      configuration:
+        secret: cluster-1-pvc-configuration
+      global:
+        repo1-retention-full: '7'
+        repo1-retention-full-type: count
+      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-17.2-4'
+      repos:
+        - name: repo1
+          schedule:
+            full: 30 2 * * *
+          storage: pvc
+          volume:
+            size: 10Gi
+  clone:
+    cluster: cluster-1
+    pgbackrest:
+      configuration:
+        secret: cluster-1-pvc-configuration
+      repo:
+        storage: pvc
\ No newline at end of file
diff --git a/clone_with_pvc/pvc.configuration b/clone_with_pvc/pvc.configuration
new file mode 100644
index 0000000..cd10607
--- /dev/null
+++ b/clone_with_pvc/pvc.configuration
@@ -0,0 +1,2 @@
+[global]
+repo1-cipher-pass=YOUR_ENCRYPTION_PASSPHRASE
\ No newline at end of file
diff --git a/clone_with_s3/kustomization.yaml b/clone_with_s3/kustomization.yaml
new file mode 100644
index 0000000..9932e2e
--- /dev/null
+++ b/clone_with_s3/kustomization.yaml
@@ -0,0 +1,10 @@
+secretGenerator:
+- name: cluster-1-s3-credentials
+  files:
+  - s3.conf
+
+generatorOptions:
+  disableNameSuffixHash: true
+
+resources:
+- postgres.yaml
diff --git a/clone_with_s3/postgres.yaml b/clone_with_s3/postgres.yaml
new file mode 100644
index 0000000..a558dbb
--- /dev/null
+++ b/clone_with_s3/postgres.yaml
@@ -0,0 +1,49 @@
+apiVersion: cpo.opensource.cybertec.at/v1
+kind: postgresql
+metadata:
+  name: cluster-1-clone
+spec:
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.2-4'
+  numberOfInstances: 1
+  postgresql:
+    version: '17'
+  resources:
+    limits:
+      cpu: 500m
+      memory: 500Mi
+    requests:
+      cpu: 500m
+      memory: 500Mi
+  teamId: acid
+  volume:
+    size: 5Gi
+  backup:
+    pgbackrest:
+      configuration:
+        secret: cluster-1-s3-credentials
+      global:
+        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-17.2-4'
+      repos:
+        - endpoint: YOUR_S3_ENDPOINT
+          name: repo1
+          region: YOUR_S3_REGION
+          resource: YOUR_BUCKET_NAME
+          schedule:
+            full: 30 2 * * *
+          storage: s3
+  clone:
+    cluster: cluster-1 # A random cluster name can be used if the source cluster is not present on the k8s.
+    pgbackrest:
+      configuration:
+        secret: cluster-1-s3-credentials
+      options:
+        repo1-path: /YOUR_PATH_INSIDE_THE_BUCKET_TO_THE_SOURCE_STANZA/repo1/
+      repo:
+        endpoint: YOUR_SOURCE_S3_ENDPOINT
+        name: repo1
+        region: YOUR_SOURCE_S3_REGION
+        resource: YOUR_SOURCE_BUCKET_NAME
+        storage: s3
\ No newline at end of file
diff --git a/clone_with_s3/s3.conf b/clone_with_s3/s3.conf
new file mode 100644
index 0000000..54c1156
--- /dev/null
+++ b/clone_with_s3/s3.conf
@@ -0,0 +1,4 @@
+[global]
+repo1-s3-key=00c20e9b9fbc9ff94028
+repo1-s3-key-secret=hxkdK+V6IKuYZF5GMYTHfqtt5XMrQ9Z7gJaUTMZk
+repo1-cipher-pass=pkjas!d82c82qasjeAasd12
\ 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 18784f2..55452da 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-17.2-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.2-4'
   numberOfInstances: 1
   postgresql:
     version: '17'
diff --git a/cluster-tutorials/high-availability-cluster/ha-postgres.yaml b/cluster-tutorials/high-availability-cluster/ha-postgres.yaml
index 36b3c02..e884aa4 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-17.2-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.2-4'
   numberOfInstances: 2
   postgresql:
     version: '17'
diff --git a/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml b/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml
index 1c25fed..566d3ab 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-17.2-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.2-4'
   numberOfInstances: 1
   postgresql:
     version: '17'
diff --git a/cluster-tutorials/monitored_cluster/postgres.yaml b/cluster-tutorials/monitored_cluster/postgres.yaml
index b35096e..99faa8e 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-17.2-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.2-4'
   numberOfInstances: 1
   postgresql:
     version: '17'
@@ -19,4 +19,4 @@ spec:
     size: 5Gi
     #storageClass: default-provisioner
   monitor:
-      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:exporter-17.2-1'
+      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:exporter-17.2-4'
diff --git a/cluster-tutorials/pgbackrest_with_gcs/postgres.yaml b/cluster-tutorials/pgbackrest_with_gcs/postgres.yaml
index 76191e7..9c458d7 100644
--- a/cluster-tutorials/pgbackrest_with_gcs/postgres.yaml
+++ b/cluster-tutorials/pgbackrest_with_gcs/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.2-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.2-4'
   numberOfInstances: 1
   postgresql:
     version: '17'
@@ -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-17.2-1'
+      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-17.2-4'
       repos:
         - name: repo1
           resource: cpo-bucket-1
diff --git a/cluster-tutorials/pgbackrest_with_pvc/postgres.yaml b/cluster-tutorials/pgbackrest_with_pvc/postgres.yaml
index 2753334..c4b8e3c 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-17.2-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.2-4'
   numberOfInstances: 1
   postgresql:
     version: '17'
@@ -24,7 +24,7 @@ spec:
       global:
         repo1-retention-full: '7'
         repo1-retention-full-type: count
-      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-17.2-1'
+      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-17.2-4'
       repos:
         - name: repo1
           schedule:
diff --git a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml
index a9eaac4..ccc08ea 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-17.2-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.2-4'
   numberOfInstances: 1
   postgresql:
     version: '17'
@@ -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-17.2-1'
+      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-17.2-4'
       repos:
         - endpoint: YOUR_S3_ENDPOINT
           name: repo1
diff --git a/cluster-tutorials/pgbackrest_with_s3/s3.conf b/cluster-tutorials/pgbackrest_with_s3/s3.conf
index 13b37c8..54c1156 100644
--- a/cluster-tutorials/pgbackrest_with_s3/s3.conf
+++ b/cluster-tutorials/pgbackrest_with_s3/s3.conf
@@ -1,4 +1,4 @@
 [global]
-repo1-s3-key=YOUR_S3_ACCESS_KEY
-repo1-s3-key-secret=YOUR_S3_KEY_SECRET
-repo1-cipher-pass=YOUR_ENCRYPTION_PASSPHRASE
+repo1-s3-key=00c20e9b9fbc9ff94028
+repo1-s3-key-secret=hxkdK+V6IKuYZF5GMYTHfqtt5XMrQ9Z7gJaUTMZk
+repo1-cipher-pass=pkjas!d82c82qasjeAasd12
\ No newline at end of file
diff --git a/cluster-tutorials/prepared_databases/postgres.yaml b/cluster-tutorials/prepared_databases/postgres.yaml
index 6c56cd5..e4338be 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-17.2-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.2-4'
   numberOfInstances: 1
   postgresql:
     version: '17'
diff --git a/cluster-tutorials/restore/postgres.yaml b/cluster-tutorials/restore/postgres.yaml
index 5ea5354..66d061a 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-17.2-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.2-4'
   numberOfInstances: 1
   postgresql:
     version: '17'
@@ -24,7 +24,7 @@ spec:
       global:
         repo1-retention-full: '7'
         repo1-retention-full-type: count
-      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-17.2-1'
+      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-17.2-4'
       repos:
         - name: repo1
           schedule:
diff --git a/cluster-tutorials/single-cluster/postgres.yaml b/cluster-tutorials/single-cluster/postgres.yaml
index d412f5a..7291961 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-17.2-1'
+  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.2-4'
   numberOfInstances: 1
   postgresql:
     version: '17'
diff --git a/setup/helm/operator/values.yaml b/setup/helm/operator/values.yaml
index 9977910..ec5fd68 100644
--- a/setup/helm/operator/values.yaml
+++ b/setup/helm/operator/values.yaml
@@ -15,8 +15,8 @@ imagePullSecretNames: []
 
 # Define the operator settings to add to the configmap
 operatorSettings:
-  operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:v0.8.1-1'
-  postgresImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.2-1'
+  operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:v0.8.2-1'
+  postgresImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.2-4'
   poolerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbouncer-1.23.1-1'
   watched_namespace: '*'
   enable_pod_antiaffinity: 'true'