diff --git a/docker-compose.yml b/docker-compose.yml
index 2ba0fb05b6..8472f93708 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -721,22 +721,22 @@ services:
       - OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
       - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
 
-#  mariadb:
-#    image: mysql:8.0.33 # fix issues when upgrading using: mysql_upgrade -u root -p
-#    container_name: appwrite-mariadb
-#    <<: *x-logging
-#    networks:
-#      - appwrite
-#    volumes:
-#      - appwrite-mariadb:/var/lib/mysql:rw
-#    ports:
-#      - "3306:3306"
-#    environment:
-#      - MYSQL_ROOT_PASSWORD=${_APP_DB_ROOT_PASS}
-#      - MYSQL_DATABASE=${_APP_DB_SCHEMA}
-#      - MYSQL_USER=${_APP_DB_USER}
-#      - MYSQL_PASSWORD=${_APP_DB_PASS}
-#    command: 'mysqld --innodb-flush-method=fsync --max_connections=${_APP_CONNECTIONS_MAX}'
+  mariadb:
+    image: mysql:8.0.33 # fix issues when upgrading using: mysql_upgrade -u root -p
+    container_name: appwrite-mariadb
+    <<: *x-logging
+    networks:
+      - appwrite
+    volumes:
+      - appwrite-mariadb:/var/lib/mysql:rw
+    ports:
+      - "3306:3306"
+    environment:
+      - MYSQL_ROOT_PASSWORD=${_APP_DB_ROOT_PASS}
+      - MYSQL_DATABASE=${_APP_DB_SCHEMA}
+      - MYSQL_USER=${_APP_DB_USER}
+      - MYSQL_PASSWORD=${_APP_DB_PASS}
+    command: 'mysqld --innodb-flush-method=fsync --max_connections=${_APP_CONNECTIONS_MAX}'
 
   # smtp:
   #   image: appwrite/smtp:1.2.0
@@ -749,53 +749,13 @@ services:
   #     - SMARTHOST_HOST=smtp
   #     - SMARTHOST_PORT=587
 
-  mariadb:
-    image: shimonnewman/mysql:3.2.30
-    platform: linux/amd64
-    <<: *x-logging
-    networks:
-      - appwrite
-    volumes:
-      - appwrite-mariadb:/var/lib/mysql:rw
-      - /Users/shimon/PhpstormProjects/appwrite/my.cnf:/etc/mysql/my.cnf:rw
-    environment:
-      - MYSQL_SERVER_ID=1
-      - MYSQL_ROLE=master
-      - MYSQL_ROOT_PASSWORD=${_APP_DB_ROOT_PASS}
-      - MYSQL_DATABASE=${_APP_DB_SCHEMA}
-      - MYSQL_USER=${_APP_DB_USER}
-      - MYSQL_PASSWORD=${_APP_DB_PASS}
-      - MYSQL_REPLICATION_USER=appwrite_replication
-      - MYSQL_REPLICATION_PASSWORD=appwrite1234
-
-  mariadb_replica:
-    image: shimonnewman/mysql:3.2.30
-    platform: linux/amd64
-    <<: *x-logging
-    networks:
-      - appwrite
-    volumes:
-      - appwrite-mariadb_replica:/var/lib/mysql:rw
-      - /Users/shimon/PhpstormProjects/appwrite/my.cnf:/etc/mysql/my.cnf:rw
-    environment:
-      - MYSQL_SERVER_ID=2
-      - MYSQL_ROLE=replica
-      - MYSQL_ROOT_PASSWORD=root_pass
-      - MYSQL_DATABASE=${_APP_DB_SCHEMA}
-      - MYSQL_REPLICATION_USER=appwrite_replication
-      - MYSQL_REPLICATION_PASSWORD=appwrite1234
-      - MYSQL_MASTER_HOST=mariadb
-      - MYSQL_REPLICA_HOST=mariadb_replica
-      - MYSQL_BACKUPS_USER=appwrite_backups
-      - MYSQL_BACKUPS_PASSWORD=appwrite1234
-
   xtrabackup:
     image: percona/percona-xtrabackup:latest
     container_name: xtrabackup
     command: sleep infinity
     volumes:
-      - ./backups:/backups:rw
-      - appwrite-mariadb_replica:/var/lib/mysql:r
+      - backup-data:/backups:rw
+      - appwrite-mariadb:/var/lib/mysql:r
     networks:
       - appwrite
     user: 'root:root'
@@ -813,13 +773,13 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
-      - ./backups:/backups:rw
+      - backup-data:/backups:rw
 
     depends_on:
       - redis
     environment:
-      - _APP_CONNECTIONS_DB_REPLICAS=
-      - _APP_CONNECTIONS_BACKUPS_STORAGE=
+      - _APP_CONNECTIONS_DB_REPLICAS
+      - _APP_CONNECTIONS_BACKUPS_STORAGE
 
   appwrite-restore:
     command: sleep infinity
@@ -993,7 +953,6 @@ networks:
 
 volumes:
   appwrite-mariadb:
-  appwrite-mariadb_replica:
   appwrite-redis:
   appwrite-cache:
   appwrite-uploads: