diff --git a/.env.default b/.env.default
index 11f1c0c..950f6f0 100644
--- a/.env.default
+++ b/.env.default
@@ -1,11 +1,10 @@
 # general
 ROOT_INSTALL=/srv
 
-# nextcloud
-SMTP_HOST=smtp.domain.com
-SMTP_SECURE=ssl
-SMTP_PORT=465
-SMTP_AUTHTYPE=LOGIN
-SMTP_NAME=admin
-SMTP_PASSWORD=password
-MAIL_FROM_ADDRESS=admin@domain.com
+# owncloud
+OWNCLOUD_VERSION=10.15
+OWNCLOUD_DOMAIN=localhost:8080
+OWNCLOUD_TRUSTED_DOMAINS=localhost
+ADMIN_USERNAME=admin
+ADMIN_PASSWORD=admin
+HTTP_PORT=8080
\ No newline at end of file
diff --git a/07-nextcloud/docker-compose.nextcloud.yml b/07-nextcloud/docker-compose.nextcloud.yml
deleted file mode 100644
index 10bb543..0000000
--- a/07-nextcloud/docker-compose.nextcloud.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-services:
-  nextcloud:
-    image: nextcloud
-    container_name: nextcloud
-    restart: always
-    ports:
-      - 8080:80
-    volumes:
-      - ${ROOT_INSTALL}/data/nextcloud:/var/www/html
-    environment:      
-      - SQLITE_DATABASE=nextcloud
-      - APACHE_BODY_LIMIT=0
-      - SMTP_HOST=${SMTP_HOST}
-      - SMTP_SECURE=${SMTP_SECURE}
-      - SMTP_PORT=${SMTP_PORT}
-      - SMTP_AUTHTYPE=${SMTP_AUTHTYPE}
-      - SMTP_NAME=${SMTP_NAME}
-      - SMTP_PASSWORD=${SMTP_PASSWORD}
-      - MAIL_FROM_ADDRESS=${MAIL_FROM_ADDRESS}
diff --git a/07-owncloud/docker-compose.owncloud.yml b/07-owncloud/docker-compose.owncloud.yml
new file mode 100644
index 0000000..47c4cb8
--- /dev/null
+++ b/07-owncloud/docker-compose.owncloud.yml
@@ -0,0 +1,43 @@
+services:
+  owncloud:
+    image: owncloud/server:${OWNCLOUD_VERSION}
+    container_name: owncloud_server
+    restart: always
+    ports:
+      - ${HTTP_PORT}:8080
+    depends_on:      
+      - redis
+    environment:
+      - OWNCLOUD_DOMAIN=${OWNCLOUD_DOMAIN}
+      - OWNCLOUD_TRUSTED_DOMAINS=${OWNCLOUD_TRUSTED_DOMAINS}
+      - OWNCLOUD_DB_TYPE=sqlite
+      - OWNCLOUD_DB_NAME=owncloud
+      - OWNCLOUD_ADMIN_USERNAME=${ADMIN_USERNAME}
+      - OWNCLOUD_ADMIN_PASSWORD=${ADMIN_PASSWORD}
+      - OWNCLOUD_MYSQL_UTF8MB4=true
+      - OWNCLOUD_REDIS_ENABLED=true
+      - OWNCLOUD_REDIS_HOST=redis
+    healthcheck:
+      test: ["CMD", "/usr/bin/healthcheck"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - ${ROOT_INSTALL}/data/owncloud:/mnt/data
+
+  redis:
+    image: redis:6
+    container_name: owncloud_redis
+    restart: always
+    command: ["--databases", "1"]
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    volumes:
+      - redis:/data
+
+volumes:
+  redis:
+    driver: local      
\ No newline at end of file