diff --git a/.env b/.env
index 9d09b00dff..8de3ada7f3 100644
--- a/.env
+++ b/.env
@@ -10,7 +10,7 @@ _APP_SYSTEM_SECURITY_EMAIL_ADDRESS=security@appwrite.io
 _APP_SYSTEM_RESPONSE_FORMAT=
 _APP_OPTIONS_ABUSE=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
-_APP_OPTIONS_FORCE_FUNCTIONS_HTTPS=disabled
+_APP_OPTIONS_FORCE_HTTPS_FUNCTIONS=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
 _APP_DOMAIN=localhost
 _APP_DOMAIN_FUNCTIONS=functions.localhost
diff --git a/app/config/variables.php b/app/config/variables.php
index 9e99695ef3..74339c43ac 100644
--- a/app/config/variables.php
+++ b/app/config/variables.php
@@ -44,7 +44,7 @@ return [
                 'filter' => ''
             ],
             [
-                'name' => '_APP_OPTIONS_FORCE_FUNCTIONS_HTTPS',
+                'name' => '_APP_OPTIONS_FORCE_HTTPS_FUNCTIONS',
                 'description' => 'Allows you to force HTTPS connection to function domains. This feature redirects any HTTP call to HTTPS and adds the \'Strict-Transport-Security\' header to all HTTP responses. By default, set to \'enabled\'. To disable, set to \'disabled\'. This feature will work only when your ports are set to default 80 and 443.',
                 'introduction' => '',
                 'default' => 'disabled',
diff --git a/app/controllers/general.php b/app/controllers/general.php
index 6d1b78c0be..345ef2d547 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -83,7 +83,7 @@ function router(App $utopia, Database $dbForConsole, SwooleRequest $swooleReques
     $type = $route->getAttribute('resourceType');
 
     if ($type === 'function') {
-        if (App::getEnv('_APP_OPTIONS_FORCE_FUNCTIONS_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
+        if (App::getEnv('_APP_OPTIONS_FORCE_HTTPS_FUNCTIONS', 'disabled') === 'enabled') { // Force HTTPS
             if ($request->getProtocol() !== 'https') {
                 if ($request->getMethod() !== Request::METHOD_GET) {
                     throw new AppwriteException(AppwriteException::GENERAL_PROTOCOL_UNSUPPORTED, 'Method unsupported over HTTP. Please use HTTPS instead.');
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index a6d9f7ad9e..86208bf48c 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -85,7 +85,7 @@ services:
       - _APP_SYSTEM_RESPONSE_FORMAT
       - _APP_OPTIONS_ABUSE
       - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FORCE_FUNCTIONS_HTTPS
+      - _APP_OPTIONS_FORCE_HTTPS_FUNCTIONS
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
       - _APP_DOMAIN_TARGET
@@ -383,7 +383,7 @@ services:
       - _APP_FUNCTIONS_CPUS
       - _APP_FUNCTIONS_MEMORY
       - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FORCE_FUNCTIONS_HTTPS
+      - _APP_OPTIONS_FORCE_HTTPS_FUNCTIONS
       - _APP_DOMAIN
       - _APP_STORAGE_DEVICE
       - _APP_STORAGE_S3_ACCESS_KEY
diff --git a/docker-compose.yml b/docker-compose.yml
index 914ce480e3..345e814cdd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -106,7 +106,7 @@ services:
       - _APP_SYSTEM_RESPONSE_FORMAT
       - _APP_OPTIONS_ABUSE
       - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FORCE_FUNCTIONS_HTTPS
+      - _APP_OPTIONS_FORCE_HTTPS_FUNCTIONS
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
       - _APP_DOMAIN_TARGET
@@ -418,7 +418,7 @@ services:
       - _APP_FUNCTIONS_CPUS
       - _APP_FUNCTIONS_MEMORY
       - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FORCE_FUNCTIONS_HTTPS
+      - _APP_OPTIONS_FORCE_HTTPS_FUNCTIONS
       - _APP_DOMAIN
       - _APP_STORAGE_DEVICE
       - _APP_STORAGE_S3_ACCESS_KEY
diff --git a/src/Appwrite/Platform/Tasks/Doctor.php b/src/Appwrite/Platform/Tasks/Doctor.php
index e5e2e38736..89b195c1d7 100644
--- a/src/Appwrite/Platform/Tasks/Doctor.php
+++ b/src/Appwrite/Platform/Tasks/Doctor.php
@@ -93,7 +93,7 @@ class Doctor extends Action
             Console::log('🟢 HTTPS force option is enabled');
         }
 
-        if ('enabled' !== App::getEnv('_APP_OPTIONS_FORCE_FUNCTIONS_HTTPS', 'disabled')) {
+        if ('enabled' !== App::getEnv('_APP_OPTIONS_FORCE_HTTPS_FUNCTIONS', 'disabled')) {
             Console::log('🔴 HTTPS force option is disabled for function domains');
         } else {
             Console::log('🟢 HTTPS force option is enabled for function domains');
diff --git a/tests/resources/docker/docker-compose.yml b/tests/resources/docker/docker-compose.yml
index 5377bf0cdc..d9c2a21414 100644
--- a/tests/resources/docker/docker-compose.yml
+++ b/tests/resources/docker/docker-compose.yml
@@ -67,7 +67,7 @@ services:
       - _APP_ENV
       - _APP_OPTIONS_ABUSE
       - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FORCE_FUNCTIONS_HTTPS
+      - _APP_OPTIONS_FORCE_HTTPS_FUNCTIONS
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
       - _APP_DOMAIN_FUNCTIONS