diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 6060320..8d21598 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -2,7 +2,6 @@ version: '2'
 services:
   db:
     image: mariadb:10.5
-    restart: always
     command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
     volumes:
       - db:/var/lib/mysql
@@ -11,11 +10,12 @@ services:
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - MYSQL_DATABASE=${MYSQL_DATABASE}
       - MYSQL_USER=${MYSQL_USER}
+    networks:
+      - cloud_limbosolutions_com_private
+    restart: unless-stopped
   app:
     image: nextcloud-smbclient:28.0
-    restart: always
-    ports:
-      - ${APP_PORT}:80
+    container_name: cloud_limbosolutions_com-nextcloud
     links:
       - db
     volumes:
@@ -24,27 +24,39 @@ services:
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - MYSQL_DATABASE=${MYSQL_DATABASE}
       - MYSQL_USER=${MYSQL_USER}
-      - MYSQL_HOST=${MYSQL_HOST}
+      - MYSQL_HOST=db
       - PHP_MEMORY_LIMIT=2048M
-  duplicati:
+    networks:
+      - cloud_limbosolutions_com_private
+      - wan_reverse_proxy_public
+    restart: unless-stopped
+  duplicati: 
     image: duplicati-mysqlclient:latest
+    container_name: cloud_limbosolutions_com-duplicati
     environment:
-      - MYSQL_HOST=${MYSQL_HOST}
+      - MYSQL_HOST=db
       - MYSQL_DATABASE=${MYSQL_DATABASE}
       - MYSQL_USER=${MYSQL_USER}
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-      - DB_BACKUP_TARGETFOLDER=/bck/db_dumps
+      - MYSQL_BACKUP_FOLDER=/bck/db-dumps
     volumes:
       - duplicati_data:/data
       - db:/bck/db_data:ro
       - html:/bck/app_data:ro
       - duplicati_data:/bck/duplicati_data:ro
       - db-dumps:/bck/db_dumps
-    ports:
-      - ${DUPLICATI_PORT}:8200
+    networks:
+      - cloud_limbosolutions_com_private
+      - wan_reverse_proxy_public
     restart: unless-stopped
+    ports:
+      - 8200:8200
 volumes:
    html:
    db:
    duplicati_data:
    db-dumps:
+networks:
+  cloud_limbosolutions_com_private:
+  wan_reverse_proxy_public:
+    external: true