diff --git a/docker-compose.nextclouod.yml b/docker-compose.nextclouod.yml
index f9e670d..ffa5a84 100644
--- a/docker-compose.nextclouod.yml
+++ b/docker-compose.nextclouod.yml
@@ -1,23 +1,48 @@
 version: '3'
 
 services:
-
   nextcloud:
-    image: linuxserver/nextcloud
     container_name: nextcloud
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=${TZ}
-    volumes:
-      - ${DIR}/nextcloud/config:/config
-      - /srv/owncloud:/data
+    image: nextcloud:latest
+    restart: always
+    ports:
+      - "8009:80"
     networks:
       - backend
-      - frontend
-    ports:
-      - 4430:443
-    restart: unless-stopped
+    depends_on:
+      - redis
+      - postgres
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.nextcloud.entrypoints=web-secure"
+      - "traefik.http.routers.nextcloud.middlewares=nextcloud,nextcloud_redirect"
+      - "traefik.http.routers.nextcloud.tls.certresolver=milvert"
+      - "traefik.http.routers.nextcloud.rule=Host(`moln.${DOMAIN}`)"
+      - "traefik.http.middlewares.nextcloud.headers.customFrameOptionsValue=ALLOW-FROM https://milvert.com"
+      - "traefik.http.middlewares.nextcloud.headers.contentSecurityPolicy=frame-ancestors 'self' milvert.com"
+      - "traefik.http.middlewares.nextcloud.headers.stsSeconds=155520011"
+      - "traefik.http.middlewares.nextcloud.headers.stsIncludeSubdomains=true"
+      - "traefik.http.middlewares.nextcloud.headers.stsPreload=true"
+      - "traefik.http.middlewares.nextcloud.headers.customFrameOptionsValue=SAMEORIGIN"
+      - "traefik.http.middlewares.nextcloud.headers.referrerPolicy=no-referrer"
+      - "traefik.http.middlewares.nextcloud.headers.SSLRedirect=true"
+      - "traefik.http.middlewares.nextcloud.headers.browserXSSFilter=true"
+      - "traefik.http.middlewares.nextcloud.headers.contentTypeNosniff=true"
+      - "traefik.http.middlewares.nextcloud_redirect.redirectregex.regex=/.well-known/(card|cal)dav"
+      - "traefik.http.middlewares.nextcloud_redirect.redirectregex.replacement=/remote.php/dav/"
+    environment:
+      - POSTGRES_DB=nextcloud
+      - POSTGRES_USER=nextcloud
+      - POSTGRES_PASSWORD=bajsa
+      - POSTGRES_HOST=postgres
+      - NEXTCLOUD_ADMIN_USER=admin
+      - NEXTCLOUD_ADMIN_PASSWORD=bajsa123
+      - REDIS_HOST=redis
+      - NEXTCLOUD_TRUSTED_DOMAINS=moln.milvert.com
+      - TRUSTED_PROXIES=172.19.0.0/16
+    volumes:
+      - ${DIR}/nextcloud-www:/var/www/html
+      - /media/NAS:/media/NAS
 
 networks:
   frontend: