diff --git a/cluster-tutorials/clone_with_pvc/postgres.yaml b/cluster-tutorials/clone_with_pvc/postgres.yaml
index 7458ec5..19fb7cb 100644
--- a/cluster-tutorials/clone_with_pvc/postgres.yaml
+++ b/cluster-tutorials/clone_with_pvc/postgres.yaml
@@ -3,10 +3,10 @@ kind: postgresql
 metadata:
   name: cluster-1-clone
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1'
+  dockerImage: 'containers.cybertec.at/cybertec-pg-container/postgres:rocky9-18.1-1'
   numberOfInstances: 1
   postgresql:
-    version: '17'
+    version: '18'
   resources:
     limits:
       cpu: 500m
@@ -24,7 +24,7 @@ spec:
       global:
         repo1-retention-full: '7'
         repo1-retention-full-type: count
-      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-17.6-1'
+      image: 'containers.cybertec.at/cybertec-pg-container/pgbackrest:rocky9-18.1-1'
       repos:
         - name: repo1
           schedule:
diff --git a/cluster-tutorials/clone_with_s3/postgres.yaml b/cluster-tutorials/clone_with_s3/postgres.yaml
index c3712b6..4f864ba 100644
--- a/cluster-tutorials/clone_with_s3/postgres.yaml
+++ b/cluster-tutorials/clone_with_s3/postgres.yaml
@@ -3,10 +3,10 @@ kind: postgresql
 metadata:
   name: cluster-1-clone
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1'
+  dockerImage: 'containers.cybertec.at/cybertec-pg-container/postgres:rocky9-18.1-1'
   numberOfInstances: 1
   postgresql:
-    version: '17'
+    version: '18'
   resources:
     limits:
       cpu: 500m
@@ -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.6-1'
+      image: 'containers.cybertec.at/cybertec-pg-container/pgbackrest:rocky9-18.1-1'
       repos:
         - endpoint: YOUR_S3_ENDPOINT
           name: repo1
diff --git a/cluster-tutorials/configure_users_and_databases/postgres.yaml b/cluster-tutorials/configure_users_and_databases/postgres.yaml
index 6ad8135..0666dc8 100644
--- a/cluster-tutorials/configure_users_and_databases/postgres.yaml
+++ b/cluster-tutorials/configure_users_and_databases/postgres.yaml
@@ -3,10 +3,10 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1'
+  dockerImage: 'containers.cybertec.at/cybertec-pg-container/postgres:rocky9-18.1-1'
   numberOfInstances: 1
   postgresql:
-    version: '17'
+    version: '18'
   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 83f3c87..2e2af33 100644
--- a/cluster-tutorials/high-availability-cluster/ha-postgres.yaml
+++ b/cluster-tutorials/high-availability-cluster/ha-postgres.yaml
@@ -3,10 +3,10 @@ kind: postgresql
 metadata:
   name: ha-cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1'
+  dockerImage: 'containers.cybertec.at/cybertec-pg-container/postgres:rocky9-18.1-1'
   numberOfInstances: 2
   postgresql:
-    version: '17'
+    version: '18'
   resources:
     limits:
       cpu: 500m
diff --git a/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml b/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml
index 7fdff85..3228e8b 100644
--- a/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml
+++ b/cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml
@@ -3,10 +3,10 @@ kind: postgresql
 metadata:
   name: ha-cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1'
+  dockerImage: 'containers.cybertec.at/cybertec-pg-container/postgres:rocky9-18.1-1'
   numberOfInstances: 1
   postgresql:
-    version: '17'
+    version: '18'
   resources:
     limits:
       cpu: 500m
@@ -15,7 +15,7 @@ spec:
       cpu: 500m
       memory: 500Mi
   connectionPooler:
-    dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbouncer-1.24.1-3'
+    dockerImage: 'containers.cybertec.at/cybertec-pg-container/pgbouncer:rocky9-1.25.0-1'
     mode: transaction
     numberOfInstances: 2
     resources:
diff --git a/cluster-tutorials/monitored_cluster/postgres.yaml b/cluster-tutorials/monitored_cluster/postgres.yaml
index c5648f8..2978d46 100644
--- a/cluster-tutorials/monitored_cluster/postgres.yaml
+++ b/cluster-tutorials/monitored_cluster/postgres.yaml
@@ -3,10 +3,10 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1'
+  dockerImage: 'containers.cybertec.at/cybertec-pg-container/postgres:rocky9-18.1-1'
   numberOfInstances: 1
   postgresql:
-    version: '17'
+    version: '18'
   resources:
     limits:
       cpu: 500m
@@ -19,4 +19,4 @@ spec:
     size: 5Gi
     #storageClass: default-provisioner
   monitor:
-      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:exporter-17.6-1'
+      image: 'containers.cybertec.at/cybertec-pg-container/exporter:rocky9-18.1-1'
diff --git a/cluster-tutorials/multisite/postgres.yaml b/cluster-tutorials/multisite/postgres.yaml
index 4df3429..5be027c 100644
--- a/cluster-tutorials/multisite/postgres.yaml
+++ b/cluster-tutorials/multisite/postgres.yaml
@@ -7,10 +7,10 @@ metadata:
     app.kubernetes.io/name: postgres-cluster
     app.kubernetes.io/instance: multisite-cluster 
 spec:
-  dockerImage: docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1'
+  dockerImage: containers.cybertec.at/cybertec-pg-container/postgres:rocky9-18.1-1'
   numberOfInstances: 1
   postgresql:
-    version: '17'
+    version: '18'
   resources:
     limits:
       cpu: 500m
diff --git a/cluster-tutorials/pgbackrest_with_gcs/postgres.yaml b/cluster-tutorials/pgbackrest_with_gcs/postgres.yaml
index 1f89a4c..c99a56e 100644
--- a/cluster-tutorials/pgbackrest_with_gcs/postgres.yaml
+++ b/cluster-tutorials/pgbackrest_with_gcs/postgres.yaml
@@ -3,10 +3,10 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1'
+  dockerImage: 'containers.cybertec.at/cybertec-pg-container/postgres:rocky9-18.1-1'
   numberOfInstances: 1
   postgresql:
-    version: '17'
+    version: '18'
   resources:
     limits:
       cpu: 100m
@@ -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.6-1'
+      image: 'containers.cybertec.at/cybertec-pg-container/pgbackrest:rocky9-18.1-1'
       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 2de033a..3def122 100644
--- a/cluster-tutorials/pgbackrest_with_pvc/postgres.yaml
+++ b/cluster-tutorials/pgbackrest_with_pvc/postgres.yaml
@@ -3,10 +3,10 @@ kind: postgresql
 metadata:
   name: cluster-pvc-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1'
+  dockerImage: 'containers.cybertec.at/cybertec-pg-container/postgres:rocky9-18.1-1'
   numberOfInstances: 1
   postgresql:
-    version: '17'
+    version: '18'
   resources:
     limits:
       cpu: 500m
@@ -24,7 +24,7 @@ spec:
       global:
         repo1-retention-full: '7'
         repo1-retention-full-type: count
-      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-17.6-1'
+      image: 'containers.cybertec.at/cybertec-pg-container/pgbackrest:rocky9-18.1-1'
       repos:
         - name: repo1
           schedule:
diff --git a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml
index a30f350..23ef8cc 100644
--- a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml
+++ b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml
@@ -3,10 +3,10 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1'
+  dockerImage: 'containers.cybertec.at/cybertec-pg-container/postgres:rocky9-18.1-1'
   numberOfInstances: 1
   postgresql:
-    version: '17'
+    version: '18'
   resources:
     limits:
       cpu: 500m
@@ -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.6-1'
+      image: 'containers.cybertec.at/cybertec-pg-container/pgbackrest:rocky9-18.1-1'
       repos:
         - endpoint: YOUR_S3_ENDPOINT
           name: repo1
diff --git a/cluster-tutorials/postgis-cluster/postgres.yaml b/cluster-tutorials/postgis-cluster/postgres.yaml
index 275f2c5..a93765a 100644
--- a/cluster-tutorials/postgis-cluster/postgres.yaml
+++ b/cluster-tutorials/postgis-cluster/postgres.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-gis-17.6-35-1'
+  dockerImage: 'containers.cybertec.at/cybertec-pg-container/postgres-gis:rocky9-18.1-35-1'
   numberOfInstances: 1
   postgresql:
     version: '17'
diff --git a/cluster-tutorials/prepared_databases/postgres.yaml b/cluster-tutorials/prepared_databases/postgres.yaml
index b9e6765..6cefc1f 100644
--- a/cluster-tutorials/prepared_databases/postgres.yaml
+++ b/cluster-tutorials/prepared_databases/postgres.yaml
@@ -3,10 +3,10 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1'
+  dockerImage: 'containers.cybertec.at/cybertec-pg-container/postgres:rocky9-18.1-1'
   numberOfInstances: 1
   postgresql:
-    version: '17'
+    version: '18'
   resources:
     limits:
       cpu: 500m
diff --git a/cluster-tutorials/restore/postgres.yaml b/cluster-tutorials/restore/postgres.yaml
index 78b9070..bb971e4 100644
--- a/cluster-tutorials/restore/postgres.yaml
+++ b/cluster-tutorials/restore/postgres.yaml
@@ -3,10 +3,10 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1'
+  dockerImage: 'containers.cybertec.at/cybertec-pg-container/postgres:rocky9-18.1-1'
   numberOfInstances: 1
   postgresql:
-    version: '17'
+    version: '18'
   resources:
     limits:
       cpu: 500m
@@ -24,7 +24,7 @@ spec:
       global:
         repo1-retention-full: '7'
         repo1-retention-full-type: count
-      image: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-17.6-1'
+      image: 'containers.cybertec.at/cybertec-pg-container/pgbackrest:rocky9-18.1-1'
       repos:
         - name: repo1
           schedule:
diff --git a/cluster-tutorials/single-cluster/postgres.yaml b/cluster-tutorials/single-cluster/postgres.yaml
index df98f1a..73a688e 100644
--- a/cluster-tutorials/single-cluster/postgres.yaml
+++ b/cluster-tutorials/single-cluster/postgres.yaml
@@ -3,10 +3,10 @@ kind: postgresql
 metadata:
   name: cluster-1
 spec:
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1'
+  dockerImage: 'containers.cybertec.at/cybertec-pg-container/postgres:rocky9-18.1-1'
   numberOfInstances: 1
   postgresql:
-    version: '17'
+    version: '18'
   resources:
     limits:
       cpu: 500m
diff --git a/cluster-tutorials/standby-cluster/postgres.yaml b/cluster-tutorials/standby-cluster/postgres.yaml
index b43fe57..b0534c9 100644
--- a/cluster-tutorials/standby-cluster/postgres.yaml
+++ b/cluster-tutorials/standby-cluster/postgres.yaml
@@ -6,10 +6,10 @@ spec:
   standby:
     standby_host: "cluster-1.cpo"
     standby_port: "5432"
-  dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1'
+  dockerImage: 'containers.cybertec.at/cybertec-pg-container/postgres:rocky9-18.1-1'
   numberOfInstances: 1
   postgresql:
-    version: '17'
+    version: '18'
   resources:
     limits:
       cpu: 500m
diff --git a/docs/index.yaml b/docs/index.yaml
index 4fb1cec..6edf737 100644
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -1,9 +1,20 @@
 apiVersion: v1
 entries:
   postgres-operator:
+  - apiVersion: v2
+    appVersion: 0.9.0
+    created: "2025-12-03T18:55:29.196695311+01:00"
+    description: Helm-Chart for setting up an instance of CYBERTEC's Postgres operator
+      (CPO).
+    digest: 63c94671d0f6219b32c0cfddf5ebaa7189bb719bda06fafc340418b633da220b
+    name: postgres-operator
+    type: application
+    urls:
+    - https://cybertec-postgresql.github.io/CYBERTEC-operator-tutorials/postgres-operator-0.9.0.tgz
+    version: 0.9.0
   - apiVersion: v2
     appVersion: 0.8.3
-    created: "2025-04-04T09:11:14.575733822+02:00"
+    created: "2025-12-03T18:55:29.196218774+01:00"
     description: Helm-Chart for setting up an instance of CYBERTEC's Postgres operator
       (CPO).
     digest: c63960331058590711189c1a4487aca03c1ba0cec9e162e485b8646fce5d5392
@@ -14,7 +25,7 @@ entries:
     version: 0.8.3
   - apiVersion: v2
     appVersion: 0.8.2
-    created: "2025-04-04T09:11:14.575395961+02:00"
+    created: "2025-12-03T18:55:29.19558977+01:00"
     description: Helm-Chart for setting up an instance of CYBERTEC's Postgres operator
       (CPO).
     digest: 403e5e1156250f663064db02ccf09e74be0dccc025556a02e502e349222c1a92
@@ -23,4 +34,4 @@ entries:
     urls:
     - https://cybertec-postgresql.github.io/CYBERTEC-operator-tutorials/postgres-operator-0.8.2.tgz
     version: 0.8.2
-generated: "2025-04-04T09:11:14.574887876+02:00"
+generated: "2025-12-03T18:55:29.186327573+01:00"
diff --git a/docs/postgres-operator-0.9.0.tgz b/docs/postgres-operator-0.9.0.tgz
new file mode 100644
index 0000000..bac304c
Binary files /dev/null and b/docs/postgres-operator-0.9.0.tgz differ
diff --git a/setup/helm/operator/Chart.yaml b/setup/helm/operator/Chart.yaml
index a7693a1..2fc26d8 100644
--- a/setup/helm/operator/Chart.yaml
+++ b/setup/helm/operator/Chart.yaml
@@ -3,6 +3,6 @@ type: application
 name: postgres-operator
 description: Helm-Chart for setting up an instance of CYBERTEC's Postgres operator (CPO).
 
-appVersion: 0.8.3
-version: 0.8.3
+appVersion: 0.9.0
+version: 0.9.0
 # Note: Make sure you have defined the correct version, based on the crd used
\ No newline at end of file
diff --git a/setup/helm/operator/templates/postgresql-operator-configuration.yaml b/setup/helm/operator/templates/postgresql-operator-configuration.yaml
index de2dd7b..2cf7bcd 100644
--- a/setup/helm/operator/templates/postgresql-operator-configuration.yaml
+++ b/setup/helm/operator/templates/postgresql-operator-configuration.yaml
@@ -25,7 +25,7 @@ configuration:
   #      - name: DATA_SOURCE_NAME
   #        value: >-
   #          postgresql://postgres_exporter:password@localhost:5432/postgres?sslmode=disable
-  #    image: 'docker.io/cybertecpostgresql/cybertec-pg-container:exporter-17.6-1'
+  #    image: 'containers.cybertec.at/cybertec-pg-container/exporter:rocky9-18.1-1'
   #    name: postgres-exporter
   #    ports:
   #      - containerPort: 9187
diff --git a/setup/helm/operator/values.yaml b/setup/helm/operator/values.yaml
index 8ee3e78..3fae66b 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:v0.8.3-2'
-  postgresImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1'
-  poolerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbouncer-1.24.1-3'
+  operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:v0.9.0-1'
+  postgresImage: 'containers.cybertec.at/cybertec-pg-container/postgres:rocky9-18.1-1'
+  poolerImage: 'containers.cybertec.at/cybertec-pg-container/pgbouncer:rocky9-1.25.0-1'
   watched_namespace: '*'
   enable_pod_antiaffinity: 'true'