diff --git a/bootstrap/helpers/constants.php b/bootstrap/helpers/constants.php
index b568e090c..36243e119 100644
--- a/bootstrap/helpers/constants.php
+++ b/bootstrap/helpers/constants.php
@@ -21,13 +21,23 @@
     'bitnami/mariadb',
     'bitnami/mongodb',
     'bitnami/redis',
+    'bitnamilegacy/mariadb',
+    'bitnamilegacy/mongodb',
+    'bitnamilegacy/redis',
+    'bitnamisecure/mariadb',
+    'bitnamisecure/mongodb',
+    'bitnamisecure/redis',
     'mysql',
     'bitnami/mysql',
+    'bitnamilegacy/mysql',
+    'bitnamisecure/mysql',
     'mysql/mysql-server',
     'mariadb',
     'postgis/postgis',
     'postgres',
     'bitnami/postgresql',
+    'bitnamilegacy/postgresql',
+    'bitnamisecure/postgresql',
     'supabase/postgres',
     'elestio/postgres',
     'mongo',
diff --git a/database/migrations/2025_10_03_154100_update_clickhouse_image.php b/database/migrations/2025_10_03_154100_update_clickhouse_image.php
new file mode 100644
index 000000000..e52bbcc16
--- /dev/null
+++ b/database/migrations/2025_10_03_154100_update_clickhouse_image.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    public function up()
+    {
+        // Change the default value for the 'image' column
+        Schema::table('standalone_clickhouses', function (Blueprint $table) {
+            $table->string('image')->default('bitnamilegacy/clickhouse')->change();
+        });
+        // Optionally, update any existing rows with the old default to the new one
+        DB::table('standalone_clickhouses')
+            ->where('image', 'bitnami/clickhouse')
+            ->update(['image' => 'bitnamilegacy/clickhouse']);
+    }
+
+    public function down()
+    {
+        Schema::table('standalone_clickhouses', function (Blueprint $table) {
+            $table->string('image')->default('bitnami/clickhouse')->change();
+        });
+        // Optionally, revert any changed values
+        DB::table('standalone_clickhouses')
+            ->where('image', 'bitnamilegacy/clickhouse')
+            ->update(['image' => 'bitnami/clickhouse']);
+    }
+};
\ No newline at end of file
diff --git a/templates/compose/moodle.yaml b/templates/compose/moodle.yaml
index 514ad4e13..3a8e02478 100644
--- a/templates/compose/moodle.yaml
+++ b/templates/compose/moodle.yaml
@@ -20,7 +20,7 @@ services:
       - mariadb-data:/var/lib/mysql
 
   moodle:
-    image: docker.io/bitnami/moodle:4.3
+    image: docker.io/bitnamilegacy/moodle:4.3
     environment:
       - SERVICE_URL_MOODLE_8080
       - MOODLE_DATABASE_HOST=mariadb
diff --git a/templates/compose/rocketchat.yaml b/templates/compose/rocketchat.yaml
index 25aef928e..1ffb02327 100644
--- a/templates/compose/rocketchat.yaml
+++ b/templates/compose/rocketchat.yaml
@@ -31,7 +31,7 @@ services:
       retries: 15
 
   mongodb:
-    image: docker.io/bitnami/mongodb:5.0
+    image: docker.io/bitnamilegacy/mongodb:5.0
     volumes:
       - mongodb_data:/bitnami/mongodb
     environment: