diff --git a/app/config/variables.php b/app/config/variables.php
index 27463d2fee..a828ceda61 100644
--- a/app/config/variables.php
+++ b/app/config/variables.php
@@ -79,6 +79,15 @@ return [
                 'question' => 'Enter your Appwrite hostname',
                 'filter' => ''
             ],
+            [
+                'name' => '_APP_CUSTOM_DOMAIN_DENY_LIST',
+                'description' => 'List of reserved or prohibited domains when configuring custom domains.',
+                'introduction' => '',
+                'default' => 'example.com,test.com,app.example.com',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
             [
                 'name' => '_APP_DOMAIN_FUNCTIONS',
                 'description' => 'A domain to use for function preview URLs. Setting to empty turns off function preview URLs.',
diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 24a28202ed..0c37e1a765 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -563,8 +563,7 @@ App::get('/v1/databases')
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForProject')
-    ->inject('project')
-    ->action(function (array $queries, string $search, Response $response, Database $dbForProject, Document $project) {
+    ->action(function (array $queries, string $search, Response $response, Database $dbForProject) {
         $queries = Query::parseQueries($queries);
 
         if (!empty($search)) {
diff --git a/app/controllers/api/proxy.php b/app/controllers/api/proxy.php
index cc5b96c78b..7ee2fa1dee 100644
--- a/app/controllers/api/proxy.php
+++ b/app/controllers/api/proxy.php
@@ -61,7 +61,13 @@ App::post('/v1/proxy/rules')
             throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your main domain to specific resource. Please use subdomain or a different domain.');
         }
 
-        $denyListString = System::getEnv('_APP_CUSTOM_DOMAIN_DENY_LIST', '');
+        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS');
+        $denyListString = System::getEnv('_APP_CUSTOM_DOMAIN_DENY_LIST');
+
+        if (!empty($functionsDomain)) {
+            $denyListString .= ',' . $functionsDomain;
+        }
+
         $deniedDomains = array_map('trim', explode(',', $denyListString));
 
         foreach ($deniedDomains as $deniedDomain) {
diff --git a/composer.lock b/composer.lock
index 5b179768e7..5409db78ec 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3497,16 +3497,16 @@
         },
         {
             "name": "utopia-php/database",
-            "version": "0.64.1",
+            "version": "0.64.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/database.git",
-                "reference": "6530a8a6d3c1fe92d0f9a92f0f05eda698d92e0b"
+                "reference": "dc9c4a68c93e8bea2dfaa76d1ba308be539998bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/6530a8a6d3c1fe92d0f9a92f0f05eda698d92e0b",
-                "reference": "6530a8a6d3c1fe92d0f9a92f0f05eda698d92e0b",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/dc9c4a68c93e8bea2dfaa76d1ba308be539998bd",
+                "reference": "dc9c4a68c93e8bea2dfaa76d1ba308be539998bd",
                 "shasum": ""
             },
             "require": {
@@ -3547,9 +3547,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/0.64.1"
+                "source": "https://github.com/utopia-php/database/tree/0.64.2"
             },
-            "time": "2025-04-02T00:35:29+00:00"
+            "time": "2025-04-09T07:53:05+00:00"
         },
         {
             "name": "utopia-php/domains",
diff --git a/docker-compose.yml b/docker-compose.yml
index 7d9018676c..74ef34603b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -198,7 +198,6 @@ services:
       - _APP_DATABASE_SHARED_TABLES_V1
       - _APP_DATABASE_SHARED_NAMESPACE
       - _APP_FUNCTIONS_CREATION_ABUSE_LIMIT
-      - _APP_DATABASE_KEYS
       - _APP_CUSTOM_DOMAIN_DENY_LIST
     extra_hosts:
       - "host.docker.internal:host-gateway"