diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml
index abecdb5..39c3330 100644
--- a/nextcloud/docker-compose.yaml
+++ b/nextcloud/docker-compose.yaml
@@ -1,26 +1,31 @@
 version: "3"
 
 services:
+  database:
+    image: postgres:13.4-alpine
+    environment:
+      - POSTGRES_USER=nextcloud
+      - POSTGRES_PASSWORD=nextcloud
+      - POSTGRES_DB=nextcloud
+    volumes:
+      - ./database:/var/lib/postgresql/data
+    restart: always
+
   nextcloud:
     image: nextcloud:23.0.4
     restart: unless-stopped
     ports:
       - 9000:80
     environment:
-      - MYSQL_HOST=mysql
-      - MYSQL_DATABASE=nextcloud
-      - MYSQL_USER=nextcloud
-      - MYSQL_PASSWORD=nextcloud
+      - POSTGRES_HOST=database
+      - POSTGRES_DB=nextcloud
+      - POSTGRES_USER=nextcloud
+      - POSTGRES_PASSWORD=nextcloud
+      - NEXTCLOUD_TRUSTED_DOMAINS=spacestation
+      - NEXTCLOUD_ADMIN_USER=admin
+      - NEXTCLOUD_ADMIN_PASSWORD=admin
     volumes:
       - ./nextcloud:/var/www/html
+    depends_on:
+      - database
 
-  mysql:
-    image: mysql:8.0
-    restart: unless-stopped
-    environment:
-      - MYSQL_DATABASE=nextcloud
-      - MYSQL_USER=nextcloud
-      - MYSQL_PASSWORD=nextcloud
-      - MYSQL_ROOT_PASSWORD=nextcloud
-    volumes:
-      - ./mysql:/var/lib/mysql