diff --git a/docker-compose/mssql/docker-compose.yml b/docker-compose/mssql/docker-compose.yml
index 65cd81ae21..4f71b3cf03 100644
--- a/docker-compose/mssql/docker-compose.yml
+++ b/docker-compose/mssql/docker-compose.yml
@@ -6,7 +6,6 @@ services:
     restart: always
     volumes:
       - db_data:/var/opt/mssql
-      - nc_data:/usr/app/data
     environment:
       SA_PASSWORD: Password123.
       ACCEPT_EULA: Y
@@ -25,6 +24,8 @@ services:
     ports:
       - "8080:8080"
     restart: always
+    volumes:
+      - nc_data:/usr/app/data
     environment:
       NC_DB: "mssql://root_db:1433?u=sa&p=Password123.&d=root_db"
 volumes:
diff --git a/docker-compose/mysql/docker-compose.yml b/docker-compose/mysql/docker-compose.yml
index f2218108d5..e0bb7d35de 100644
--- a/docker-compose/mysql/docker-compose.yml
+++ b/docker-compose/mysql/docker-compose.yml
@@ -5,7 +5,6 @@ services:
     image: mysql:5.7
     volumes:
       - db_data:/var/lib/mysql
-      - nc_data:/usr/app/data
 #    below line shows how to change charset and collation
 #    uncomment it if necessary
 #    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
@@ -28,6 +27,8 @@ services:
     ports:
       - "8080:8080"
     restart: always
+    volumes:
+      - nc_data:/usr/app/data
     environment:
       NC_DB: "mysql2://root_db:3306?u=noco&p=password&d=root_db"
 volumes:
diff --git a/docker-compose/nginx-proxy-manager/docker-compose.yml b/docker-compose/nginx-proxy-manager/docker-compose.yml
index 2998337251..e3d94940a8 100644
--- a/docker-compose/nginx-proxy-manager/docker-compose.yml
+++ b/docker-compose/nginx-proxy-manager/docker-compose.yml
@@ -5,7 +5,6 @@ services:
     image: mysql:5.7
     volumes:
       - db_data:/var/lib/mysql
-      - nc_data:/usr/app/data
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: password
@@ -25,12 +24,14 @@ services:
         condition: service_healthy
     image: nocodb/nocodb:latest
     restart: always
+    volumes:
+      - nc_data:/usr/app/data
     environment:
       NC_DB: "mysql2://root_db:3306?u=noco&p=password&d=root_db"
     networks:
       - default
       - nginxproxy
-      
+
   nginx-proxy-manager:
     image: jlesage/nginx-proxy-manager
     restart: always
diff --git a/docker-compose/pg/docker-compose.yml b/docker-compose/pg/docker-compose.yml
index d622fb0f19..c95c5020b7 100644
--- a/docker-compose/pg/docker-compose.yml
+++ b/docker-compose/pg/docker-compose.yml
@@ -6,7 +6,6 @@ services:
     restart: always
     volumes:
       - db_data:/var/lib/postgresql/data
-      - nc_data:/usr/app/data
     environment:
       POSTGRES_PASSWORD: password
       POSTGRES_USER: postgres
@@ -24,6 +23,8 @@ services:
     ports:
       - "8080:8080"
     restart: always
+    volumes:
+      - nc_data:/usr/app/data
     environment:
       NC_DB: "pg://root_db:5432?u=postgres&p=password&d=root_db"
 volumes:
diff --git a/docker-compose/traefik/docker-compose.yml b/docker-compose/traefik/docker-compose.yml
index b764da6588..4508b094c2 100644
--- a/docker-compose/traefik/docker-compose.yml
+++ b/docker-compose/traefik/docker-compose.yml
@@ -9,9 +9,11 @@ volumes:
     name: traefik-letsencrypt
   nocodb-db:
     name: nocodb-db
-    
+  nocodb-data:
+    name: nocodb-data
+
 services:
-   
+
     traefik:
         image: traefik:v2.2
         container_name: traefik
@@ -19,18 +21,18 @@ services:
         command:
             #- "--log.level=DEBUG"
             - "--providers.docker=true"
-            - "--ping=true"            
+            - "--ping=true"
             - "--ping.entryPoint=ping"
             - "--providers.docker.exposedbydefault=false"
-            - "--providers.docker.network=traefik_proxy"             
+            - "--providers.docker.network=traefik_proxy"
             - "--entryPoints.ping.address=:8081"
             - "--entrypoints.http.address=:80"
-            - "--entrypoints.https.address=:443"      
+            - "--entrypoints.https.address=:443"
             - "--entrypoints.https.http.tls.certresolver=letsencrypt"
             - "--entrypoints.https.http.tls.domains[0].main=${DOMAINNAME}"
-            - "--entrypoints.https.http.tls.domains[0].sans=*.${DOMAINNAME}"       
+            - "--entrypoints.https.http.tls.domains[0].sans=*.${DOMAINNAME}"
             - "--entrypoints.http.http.redirections.entryPoint.to=https"
-            - "--entrypoints.http.http.redirections.entryPoint.scheme=https"            
+            - "--entrypoints.http.http.redirections.entryPoint.scheme=https"
             - "--certificatesresolvers.letsencrypt.acme.dnsChallenge.delayBeforeCheck=15"
             - "--certificatesresolvers.letsencrypt.acme.dnschallenge.provider=cloudflare"
             - "--certificatesresolvers.letsencrypt.acme.email=info@${DOMAINNAME}"
@@ -46,7 +48,7 @@ services:
             - default
             - traefik_proxy
         ports:
-            - "80:80"         
+            - "80:80"
             - "443:443"
         volumes:
             - "letsencrypt:/letsencrypt"
@@ -57,33 +59,35 @@ services:
         container_name: watchtower
         restart: always
         networks:
-            - traefik_proxy    
+            - traefik_proxy
         command: --schedule "0 5 * * *" --cleanup --label-enable
-        
+
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock:ro
         labels:
             - "com.centurylinklabs.watchtower.enable=true"
-            
+
     nocodb:
         container_name: nocodb
         image: nocodb/nocodb:latest
         restart: always
+        volumes:
+          - nocodb-data:/usr/app/data
         networks:
           - traefik_proxy
         environment:
-          - NC_DB=pg://nocodb-db:5432?u=${DATABASE_USER}&p=${DATABASE_PW}&d=${DATABASE_NAME}          
+          - NC_DB=pg://nocodb-db:5432?u=${DATABASE_USER}&p=${DATABASE_PW}&d=${DATABASE_NAME}
           - NC_PUBLIC_URL=https://nocodb.${DOMAINNAME}
           - NC_DISABLE_TELE=true
         labels:
             - "traefik.enable=true"
             - "traefik.http.services.nocodb.loadbalancer.server.port=8080"
             - "traefik.http.routers.nocodb.rule=Host(`nocodb.${DOMAINNAME}`)"
-            - "traefik.http.routers.nocodb.entrypoints=https" 
+            - "traefik.http.routers.nocodb.entrypoints=https"
             - "com.centurylinklabs.watchtower.enable=true"
         depends_on:
           - nocodb-db
-            
+
     nocodb-db:
         image: postgres:12.1-alpine
         container_name: nocodb-db