diff --git a/.github/workflows/helm-deployment.yaml b/.github/workflows/helm-deployment.yaml
index 0c3854e4a0..264e67a89e 100644
--- a/.github/workflows/helm-deployment.yaml
+++ b/.github/workflows/helm-deployment.yaml
@@ -43,13 +43,13 @@ jobs:
           kbld version
 
       - name: start minikube
-        if: github.event_name == 'push' && !startsWith(github.ref, 'refs/heads/release-please--')
+        if: github.event_name == 'pull_request' && !startsWith(github.head_ref, 'release-please--')
         id: minikube
         uses: medyagh/setup-minikube@v0.0.18
         with:
           addons: ingress
 
       - name: Deploy to minikube
-        if: github.event_name == 'push' && !startsWith(github.ref, 'refs/heads/release-please--')
+        if: github.event_name == 'pull_request' && !startsWith(github.head_ref, 'release-please--')
         working-directory: ./helm
         run: make deploy KAPP_ARGS="-y --logs-all"
diff --git a/helm/Makefile b/helm/Makefile
index 0f07636a7b..940b3857ac 100644
--- a/helm/Makefile
+++ b/helm/Makefile
@@ -44,4 +44,4 @@ docker-build-minikube:
 	cd .. && make docker-build-minikube
 
 update-kc-realm:
-	kubectl create configmap realm --from-file=realm.json=../docker/keycloak/realm.json --dry-run=client -o yaml > realm-config-map.yaml
\ No newline at end of file
+	kubectl create configmap realm --from-file=realm.json=../docker/keycloak/realm.json --dry-run=client -o yaml > realm-config-map.yaml
diff --git a/helm/cosmo/README.md b/helm/cosmo/README.md
index a6e6882916..b5d1677751 100644
--- a/helm/cosmo/README.md
+++ b/helm/cosmo/README.md
@@ -44,6 +44,8 @@ This is the official Helm Chart for WunderGraph Cosmo - The Full Lifecycle Graph
 | clickhouse.auth.password | string | `"changeme"` |  |
 | clickhouse.auth.username | string | `"default"` |  |
 | clickhouse.commonAnnotations."kapp.k14s.io/change-group" | string | `"cosmo.apps.clickhouse.wundergraph.com/deployment"` |  |
+| clickhouse.image.registry | string | `"docker.io"` |  |
+| clickhouse.image.repository | string | `"bitnamilegacy/clickhouse"` |  |
 | clickhouse.initdbScripts."db-init.sh" | string | `"#!/bin/bash\nset -e\nclickhouse-client --user $CLICKHOUSE_ADMIN_USER --password $CLICKHOUSE_ADMIN_PASSWORD -n <<-EOSQL\n  CREATE DATABASE IF NOT EXISTS cosmo;\nEOSQL\n"` |  |
 | clickhouse.persistence.annotations."kapp.k14s.io/owned-for-deletion" | string | `""` |  |
 | clickhouse.persistence.size | string | `"2Gi"` |  |
@@ -202,6 +204,8 @@ This is the official Helm Chart for WunderGraph Cosmo - The Full Lifecycle Graph
 | minio.auth.rootUser | string | `"minio"` |  |
 | minio.commonAnnotations."kapp.k14s.io/change-group" | string | `"cosmo.apps.minio.wundergraph.com/deployment"` |  |
 | minio.defaultBuckets | string | `"cosmo"` |  |
+| minio.image.registry | string | `"docker.io"` |  |
+| minio.image.repository | string | `"bitnamilegacy/minio"` |  |
 | minio.persistence.annotations."kapp.k14s.io/owned-for-deletion" | string | `""` |  |
 | minio.persistence.size | string | `"1Gi"` |  |
 | minio.service.ports.minio | int | `9000` |  |
@@ -219,6 +223,8 @@ This is the official Helm Chart for WunderGraph Cosmo - The Full Lifecycle Graph
 | postgresql.auth.password | string | `"changeme"` |  |
 | postgresql.auth.username | string | `"postgres"` |  |
 | postgresql.commonAnnotations."kapp.k14s.io/change-group" | string | `"cosmo.apps.postgresql.wundergraph.com/deployment"` |  |
+| postgresql.image.registry | string | `"docker.io"` |  |
+| postgresql.image.repository | string | `"bitnamilegacy/postgresql"` |  |
 | postgresql.primary.initdb.password | string | `"changeme"` |  |
 | postgresql.primary.initdb.scripts."01_init_keycloak.sql" | string | `"-- Create the database for Keycloak\nCREATE DATABASE \"keycloak\";\n"` |  |
 | postgresql.primary.initdb.user | string | `"postgres"` |  |
@@ -228,6 +234,8 @@ This is the official Helm Chart for WunderGraph Cosmo - The Full Lifecycle Graph
 | redis.auth.enabled | bool | `false` |  |
 | redis.commonAnnotations."kapp.k14s.io/change-group" | string | `"cosmo.apps.redis.wundergraph.com/deployment"` |  |
 | redis.commonConfiguration | string | `"# Enable AOF https://redis.io/topics/persistence#append-only-file\nappendonly yes\n# Enable RDB persistence (backup every 24h)\nsave \"86400 1\"\n# Disable maxmemory-policy https://redis.io/topics/lru-cache#eviction-policies\nmaxmemory-policy noeviction\n# Set maxmemory to 100mb\nmaxmemory 100mb"` |  |
+| redis.image.registry | string | `"docker.io"` |  |
+| redis.image.repository | string | `"bitnamilegacy/redis"` |  |
 | redis.master.persistence.annotations."kapp.k14s.io/owned-for-deletion" | string | `""` |  |
 | redis.master.persistence.enabled | bool | `true` |  |
 | redis.master.persistence.size | string | `"1Gi"` |  |
diff --git a/helm/cosmo/values.yaml b/helm/cosmo/values.yaml
index b49f233b5b..c52121cc3b 100644
--- a/helm/cosmo/values.yaml
+++ b/helm/cosmo/values.yaml
@@ -399,6 +399,9 @@ keycloak:
 # ClickHouse for the Cosmo Controlplane & Collectors
 # https://artifacthub.io/packages/helm/bitnami/clickhouse
 clickhouse:
+  image:
+    registry: docker.io
+    repository: bitnamilegacy/clickhouse
   shards: 1
   # 1 replica for development
   replicaCount: 1
@@ -431,6 +434,9 @@ clickhouse:
 # Postgres for the Cosmo Controlplane
 # https://artifacthub.io/packages/helm/bitnami/postgresql
 postgresql:
+  image:
+    registry: docker.io
+    repository: bitnamilegacy/postgresql
   commonAnnotations:
     # Support for k14s.io. This annotation will form a group to coordinate deployments with kapp.
     kapp.k14s.io/change-group: 'cosmo.apps.postgresql.wundergraph.com/deployment'
@@ -460,6 +466,9 @@ postgresql:
 # Minio for the Cosmo Controlplane
 # https://artifacthub.io/packages/helm/bitnami/minio
 minio:
+  image:
+    registry: docker.io
+    repository: bitnamilegacy/minio
   persistence:
     size: 1Gi
     annotations:
@@ -481,6 +490,9 @@ minio:
 # https://artifacthub.io/packages/helm/bitnami/redis
 
 redis:
+  image:
+    registry: docker.io
+    repository: bitnamilegacy/redis
   auth:
     enabled: false
   replica: