diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index 88823c18..f4c978f5 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -14,16 +14,6 @@ services:
     volumes:
       - "{{ root }}/redis:/data"
     
-  {% if db_flavor == 'postgresql' and postgresql == 'internal' %}    
-  database:
-    image: ${DOCKER_ORG:-mailu}/postgresql:${MAILU_VERSION:-{{ version }}}
-    restart: always
-    env_file: {{ env }}
-    volumes:
-      - "{{ root }}/data/psql_db:/data"
-      - "{{ root }}/data/psql_backup:/backup"
-   {% endif %}
-
   # Core services
   front:
     image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-{{ version }}}
@@ -157,6 +147,16 @@ services:
       - imap
   {% endif %}
   
+  {% if db_flavor == 'postgresql' and postgresql == 'internal' %}
+  database:
+    image: ${DOCKER_ORG:-mailu}/postgresql:${MAILU_VERSION:-{{ version }}}
+    restart: always
+    env_file: {{ env }}
+    volumes:
+      - "{{ root }}/data/psql_db:/data"
+      - "{{ root }}/data/psql_backup:/backup"
+   {% endif %}
+
 {% if resolver_enabled or db_flavor == 'postgresql' %}
 networks:
   default:
diff --git a/setup/flavors/stack/docker-compose.yml b/setup/flavors/stack/docker-compose.yml
index 1506e761..1bc4806f 100644
--- a/setup/flavors/stack/docker-compose.yml
+++ b/setup/flavors/stack/docker-compose.yml
@@ -13,12 +13,6 @@ services:
     volumes:
       - "{{ root }}/redis:/data"
 
-  {% if db_flavor == 'postgresql' and postgresql == 'internal' %}
-  database:
-    image: ${DOCKER_ORG:-mailu}/postgresql:${MAILU_VERSION:-{{ version }}}
-    env_file: {{ env }}
- {% endif %}
-
 # Core services
   front:
     image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-{{ version }}}
@@ -149,6 +143,14 @@ services:
       replicas: 1
   {% endif %}
 
+  {% if db_flavor == 'postgresql' and postgresql == 'internal' %}
+  database:
+    image: ${DOCKER_ORG:-mailu}/postgresql:${MAILU_VERSION:-{{ version }}}
+    env_file: {{ env }}
+    volumes:
+      - "{{ root }}/data/psql_backup:/backup"
+  {% endif %}
+
 networks:
   default:
     driver: overlay