diff --git a/charts/villas/Chart.lock b/charts/villas/Chart.lock
index fa2977d..1f51ea1 100644
--- a/charts/villas/Chart.lock
+++ b/charts/villas/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: rabbitmq
-  repository: https://charts.bitnami.com/bitnami
-  version: 10.3.6
-- name: postgresql
-  repository: https://charts.bitnami.com/bitnami
-  version: 11.9.1
+  repository: oci://registry-1.docker.io/cloudpirates
+  version: 0.3.2
+- name: postgres
+  repository: oci://registry-1.docker.io/cloudpirates
+  version: 0.7.3
 - name: minio
   repository: https://charts.bitnami.com/bitnami
   version: 11.10.3
-digest: sha256:402fe7dacea276f5fb96caa8e4837bcb6309d3bb2e41dc7113adfaaf78ca6e66
-generated: "2022-09-28T11:25:46.960695+02:00"
+digest: sha256:0e95383933f3249335bb0b5e6b72b45763dc9fd078e3d86a37bf46e910c51de3
+generated: "2025-10-09T13:47:55.981685779Z"
diff --git a/charts/villas/Chart.yaml b/charts/villas/Chart.yaml
index d9ee2fb..adacf6d 100644
--- a/charts/villas/Chart.yaml
+++ b/charts/villas/Chart.yaml
@@ -16,14 +16,14 @@ maintainers:
 
 dependencies:
   - name: rabbitmq
-    version: 10.3.6
-    repository: "https://charts.bitnami.com/bitnami"
+    version: 0.3.2
+    repository: "oci://registry-1.docker.io/cloudpirates"
     condition: "broker.enabled"
     alias: broker
 
-  - name: postgresql
-    version: 11.9.1
-    repository: "https://charts.bitnami.com/bitnami"
+  - name: postgres
+    version: 0.7.3
+    repository: "oci://registry-1.docker.io/cloudpirates"
     condition: "database.enabled"
     alias: database
 
diff --git a/charts/villas/charts/postgres-0.7.3.tgz b/charts/villas/charts/postgres-0.7.3.tgz
new file mode 100644
index 0000000..31122d9
Binary files /dev/null and b/charts/villas/charts/postgres-0.7.3.tgz differ
diff --git a/charts/villas/charts/postgresql-11.9.1.tgz b/charts/villas/charts/postgresql-11.9.1.tgz
deleted file mode 100644
index f14b338..0000000
Binary files a/charts/villas/charts/postgresql-11.9.1.tgz and /dev/null differ
diff --git a/charts/villas/charts/rabbitmq-0.3.2.tgz b/charts/villas/charts/rabbitmq-0.3.2.tgz
new file mode 100644
index 0000000..7dc8e74
Binary files /dev/null and b/charts/villas/charts/rabbitmq-0.3.2.tgz differ
diff --git a/charts/villas/charts/rabbitmq-10.3.6.tgz b/charts/villas/charts/rabbitmq-10.3.6.tgz
deleted file mode 100644
index 82290a4..0000000
Binary files a/charts/villas/charts/rabbitmq-10.3.6.tgz and /dev/null differ
diff --git a/charts/villas/values.yaml b/charts/villas/values.yaml
index 8acd1d9..57191dd 100644
--- a/charts/villas/values.yaml
+++ b/charts/villas/values.yaml
@@ -222,6 +222,8 @@ controller:
   extraConfig: {}
 
 database:
+  image:
+    tag: 14.5-bullseye
   # Set to false for using an external broker
   # If so, provide the connection details in broker.external
   enabled: true