diff --git a/.env b/.env
index d514529a9..3406ba100 100644
--- a/.env
+++ b/.env
@@ -35,7 +35,7 @@ _APP_FUNCTIONS_CPUS=1
 _APP_FUNCTIONS_MEMORY=128
 _APP_FUNCTIONS_MEMORY_SWAP=128
 _APP_MAINTENANCE_INTERVAL=86400
-_APP_MAINTENANCE_EXECUTION_LOG_RETENTION=1209600
-_APP_MAINTENANCE_ABUSE_LOG_RETENTION=86400
-_APP_MAINTENANCE_AUDIT_LOG_RETENTION=1209600
+_APP_MAINTENANCE_RETENTION_EXECUTION=1209600
+_APP_MAINTENANCE_RETENTION_ABUSE=86400
+_APP_MAINTENANCE_RETENTION_AUDIT=1209600
 _APP_USAGE_STATS=enabled
diff --git a/Dockerfile b/Dockerfile
index 0f97e3ec4..c7316bd1d 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -101,10 +101,10 @@ ENV _APP_SERVER=swoole \
     _APP_VERSION=$VERSION \
     _APP_USAGE_STATS=enabled \
     # 14 Days = 1209600 s
-    _APP_MAINTENANCE_EXECUTION_LOG_RETENTION=1209600 \
-    _APP_MAINTENANCE_AUDIT_LOG_RETENTION=1209600 \
+    _APP_MAINTENANCE_RETENTION_EXECUTION=1209600 \
+    _APP_MAINTENANCE_RETENTION_AUDIT=1209600 \
     # 1 Day = 86400 s
-    _APP_MAINTENANCE_ABUSE_LOG_RETENTION=86400 \
+    _APP_MAINTENANCE_RETENTION_ABUSE=86400 \
     _APP_MAINTENANCE_INTERVAL=86400
 #ENV _APP_SMTP_SECURE ''
 #ENV _APP_SMTP_USERNAME ''
diff --git a/app/config/variables.php b/app/config/variables.php
index 5b710ad3f..cd5d220f3 100644
--- a/app/config/variables.php
+++ b/app/config/variables.php
@@ -365,7 +365,7 @@ return [
                     'question' => '',
                 ],
                 [
-                    'name' => '_APP_MAINTENANCE_EXECUTION_LOG_RETENTION',
+                    'name' => '_APP_MAINTENANCE_RETENTION_EXECUTION',
                     'description' => 'The maximum duration (in seconds) upto which to retain execution logs. The default value is 1209600 seconds (14 days).',
                     'introduction' => '0.7.0',
                     'default' => '1209600',
@@ -373,7 +373,7 @@ return [
                     'question' => '',
                 ],
                 [
-                    'name' => '_APP_MAINTENANCE_AUDIT_LOG_RETENTION',
+                    'name' => '_APP_MAINTENANCE_RETENTION_AUDIT',
                     'description' => 'IThe maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
                     'introduction' => '0.7.0',
                     'default' => '1209600',
@@ -381,7 +381,7 @@ return [
                     'question' => '',
                 ],
                 [
-                    'name' => '_APP_MAINTENANCE_ABUSE_LOG_RETENTION',
+                    'name' => '_APP_MAINTENANCE_RETENTION_ABUSE',
                     'description' => 'The maximum duration (in seconds) upto which to retain abuse logs. The default value is 86400 seconds (1 day).',
                     'introduction' => '0.7.0',
                     'default' => '86400',
diff --git a/app/tasks/maintenance.php b/app/tasks/maintenance.php
index df4005593..78a31e6dd 100644
--- a/app/tasks/maintenance.php
+++ b/app/tasks/maintenance.php
@@ -42,9 +42,9 @@ $cli
     ->action(function () {
         // # of days in seconds (1 day = 86400s)
         $interval = (int) App::getEnv('_APP_MAINTENANCE_INTERVAL', '86400');
-        $executionLogsRetention = (int) App::getEnv('_APP_MAINTENANCE_EXECUTION_LOG_RETENTION', '1209600');
-        $auditLogRetention = (int) App::getEnv('_APP_MAINTENANCE_AUDIT_LOG_RETENTION', '1209600');
-        $abuseLogsRetention = (int) App::getEnv('_APP_MAINTENANCE_ABUSE_LOG_RETENTION', '86400');
+        $executionLogsRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', '1209600');
+        $auditLogRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', '1209600');
+        $abuseLogsRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', '86400');
 
         Console::loop(function() use ($interval, $executionLogsRetention, $abuseLogsRetention, $auditLogRetention){
             $time = date('d-m-Y H:i:s', time());
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index 098d4d407..231d2f857 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -279,11 +279,10 @@ services:
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_MAINTENANCE_INTERVAL
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
+      - _APP_MAINTENANCE_RETENTION_EXECUTION
+      - _APP_MAINTENANCE_RETENTION_ABUSE
+      - _APP_MAINTENANCE_RETENTION_AUDIT
+
 
   appwrite-schedule:
     image: appwrite/appwrite:<?php echo $version."\n"; ?>
diff --git a/docker-compose.yml b/docker-compose.yml
index 9d47f1024..e601ae708 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -329,9 +329,9 @@ services:
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_MAINTENANCE_INTERVAL
-      - _APP_MAINTENANCE_EXECUTION_LOG_RETENTION
-      - _APP_MAINTENANCE_ABUSE_LOG_RETENTION
-      - _APP_MAINTENANCE_AUDIT_LOG_RETENTION
+      - _APP_MAINTENANCE_RETENTION_EXECUTION
+      - _APP_MAINTENANCE_RETENTION_ABUSE
+      - _APP_MAINTENANCE_RETENTION_AUDIT
 
   appwrite-schedule:
     entrypoint: schedule