diff --git a/docker-compose.yml b/docker-compose.yml
index eedf9fa..850023f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,54 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
 
+  nextcloud-db:
+    image: postgres:alpine
+    restart: always
+    volumes:
+      - ./appdata/nextcloud/db/data:/var/lib/postgresql/data:z
+    env_file:
+      - .env
+
+  nextcloud-redis:
+    image: redis:alpine
+    restart: always
+
+  nextcloud:
+    image: nextcloud:fpm-alpine
+    restart: always
+    volumes:
+      - ./appdata/nextcloud/html:/var/www/html:z
+      - /mnt/storage:/storage
+    environment:
+      - POSTGRES_HOST=nextcloud-db
+      - REDIS_HOST=nextcloud-redis
+    env_file:
+      - .env
+    depends_on:
+      - nextcloud-db
+      - nextcloud-redis
+
+  nextcloud-web:
+    image: nginx:alpine
+    restart: always
+    ports:
+      - 192.168.1.33:8080:80
+    volumes:
+      - ./appdata/nextcloud/nginx.conf:/etc/nginx/nginx.conf
+      - ./appdata/nextcloud/html:/var/www/html:z,ro
+    depends_on:
+      - nextcloud
+
+  nextcloud-cron:
+    image: nextcloud:fpm-alpine
+    restart: always
+    volumes:
+      - ./appdata/nextcloud/html:/var/www/html:z
+    entrypoint: /cron.sh
+    depends_on:
+      - nextcloud-db
+      - nextcloud-redis
+
   spdf:
     container_name: spdf
     image: frooodle/s-pdf
diff --git a/nextcloud/db.env b/nextcloud/db.env
deleted file mode 100644
index 9b1b9d6..0000000
--- a/nextcloud/db.env
+++ /dev/null
@@ -1,3 +0,0 @@
-POSTGRES_PASSWORD=8ung1e1!
-POSTGRES_DB=nextcloud
-POSTGRES_USER=nextcloud
\ No newline at end of file
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
deleted file mode 100644
index 405b821..0000000
--- a/nextcloud/docker-compose.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-version: '3'
-
-services:
-  db:
-    image: postgres:alpine
-    restart: always
-    volumes:
-      - db:/var/lib/postgresql/data:z
-    env_file:
-      - db.env
-
-  redis:
-    image: redis:alpine
-    restart: always
-
-  app:
-    image: nextcloud:fpm-alpine
-    restart: always
-    volumes:
-      - nextcloud:/var/www/html:z
-      - /mnt/storage:/storage
-    environment:
-      - POSTGRES_HOST=db
-      - REDIS_HOST=redis
-    env_file:
-      - db.env
-    depends_on:
-      - db
-      - redis
-
-  web:
-    build: ./web
-    restart: always
-    ports:
-      - 192.168.1.33:8080:80
-    volumes:
-      - nextcloud:/var/www/html:z,ro
-    depends_on:
-      - app
-
-  cron:
-    image: nextcloud:fpm-alpine
-    restart: always
-    volumes:
-      - nextcloud:/var/www/html:z
-    entrypoint: /cron.sh
-    depends_on:
-      - db
-      - redis
-
-volumes:
-  db:
-  nextcloud:
diff --git a/nextcloud/web/Dockerfile b/nextcloud/web/Dockerfile
deleted file mode 100644
index 9ded20d..0000000
--- a/nextcloud/web/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nginx:alpine
-
-COPY nginx.conf /etc/nginx/nginx.conf
\ No newline at end of file
diff --git a/nextcloud/web/nginx.conf b/nginx.conf
similarity index 100%
rename from nextcloud/web/nginx.conf
rename to nginx.conf