diff --git a/nextcloud/.example-env b/nextcloud/.example-env
deleted file mode 100644
index 15a86a0..0000000
--- a/nextcloud/.example-env
+++ /dev/null
@@ -1,10 +0,0 @@
-# Nextcloud
-NEXTCLOUD_DOMAIN=
-NEXTCLOUD_ADMIN_PASSWORD=
-NEXTCLOUD_ADMIN_USER=
-NEXTCLOUD_DB_HOST=
-NEXTCLOUD_DB_NAME=
-NEXTCLOUD_DB_PASSWORD=
-NEXTCLOUD_DB_USER=
-NEXTCLOUD_TRUSTED_DOMAINS=
-ONLYOFFICE_JWT_SECRET=
diff --git a/nextcloud/create_infra.bash b/nextcloud/create_infra.bash
deleted file mode 100755
index 258e8c9..0000000
--- a/nextcloud/create_infra.bash
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-source .env
-source ../core/.env
-
-docker exec postgres psql -U $POSTGRES_USER -d postgres -c "CREATE USER $NEXTCLOUD_DB_USER WITH PASSWORD '$NEXTCLOUD_DB_PASSWORD';"
-docker exec postgres psql -U $POSTGRES_USER -d postgres -c "CREATE DATABASE $NEXTCLOUD_DB_NAME OWNER $NEXTCLOUD_DB_USER;"
-docker exec postgres psql -U $POSTGRES_USER -d $NEXTCLOUD_DB_NAME -c "GRANT ALL PRIVILEGES ON DATABASE $NEXTCLOUD_DB_NAME TO $NEXTCLOUD_DB_USER;"
diff --git a/nextcloud/hooks/post-installation/install-only-office.sh b/nextcloud/hooks/post-installation/install-only-office.sh
index 0017fa9..2dedab9 100644
--- a/nextcloud/hooks/post-installation/install-only-office.sh
+++ b/nextcloud/hooks/post-installation/install-only-office.sh
@@ -23,7 +23,7 @@ php /var/www/html/occ --no-warnings app:install onlyoffice
 # Set the DocumentServerUrl to the path of the OnlyOffice Document Server
 php /var/www/html/occ --no-warnings config:system:set onlyoffice DocumentServerUrl --value="/ds-vpath/"
 # Set the DocumentServerInternalUrl to the URL of the OnlyOffice Document Server
-php /var/www/html/occ --no-warnings config:system:set onlyoffice DocumentServerInternalUrl --value="http://onlyoffice-document-server/"
+php /var/www/html/occ --no-warnings config:system:set onlyoffice DocumentServerInternalUrl --value="http://onlyoffice-documentserver/"
 # Set the StorageUrl to the URL of the Nextcloud Reverse Proxy
 php /var/www/html/occ --no-warnings config:system:set onlyoffice StorageUrl --value="http://nextcloud-reverse-proxy/"
 # Set the JWT secret
diff --git a/nextcloud/reverse-proxy/nginx.conf b/nextcloud/reverse-proxy/nginx.conf
index e664212..fcc67f6 100644
--- a/nextcloud/reverse-proxy/nginx.conf
+++ b/nextcloud/reverse-proxy/nginx.conf
@@ -92,7 +92,7 @@ http {
 
 	location ~* ^/ds-vpath/ {
 		rewrite /ds-vpath/(.*) /$1  break;
-                proxy_pass http://onlyoffice-document-server;
+                proxy_pass http://onlyoffice-documentserver;
                 proxy_redirect     off;
 
                 client_max_body_size 100m;
diff --git a/onlyoffice/docker-compose.yml b/onlyoffice/docker-compose.yml
index daaeb20..27670cb 100644
--- a/onlyoffice/docker-compose.yml
+++ b/onlyoffice/docker-compose.yml
@@ -1,50 +1,55 @@
 services:
-  onlyoffice-document-server:
+  onlyoffice-documentserver:
     build:
       context: .
-    container_name: onlyoffice-document-server
+    container_name: onlyoffice-documentserver
     depends_on:
+      - onlyoffice-postgresql
       - onlyoffice-rabbitmq
     environment:
-      - DB_TYPE=${ONLYOFFICE_DB_TYPE}
-      - DB_HOST=${ONLYOFFICE_DB_HOST}
-      - DB_PORT=${ONLYOFFICE_DB_PORT}
-      - DB_NAME=${ONLYOFFICE_DB_NAME}
-      - DB_USER=${ONLYOFFICE_DB_USER}
-      - DB_PWD=${ONLYOFFICE_DB_PASSWORD}
+      - DB_TYPE=postgres
+      - DB_HOST=onlyoffice-postgresql
+      - DB_PORT=5432
+      - DB_NAME=onlyoffice
+      - DB_USER=onlyoffice
       - AMQP_URI=amqp://guest:guest@onlyoffice-rabbitmq
       # Uncomment strings below to enable the JSON Web Token validation.
-      - JWT_ENABLED=true
-      - JWT_SECRET=${ONLYOFFICE_JWT_SECRET}
-      - JWT_HEADER=Authorization
-      - JWT_IN_BODY=true
+      #- JWT_ENABLED=true
+      #- JWT_SECRET=secret
+      #- JWT_HEADER=Authorization
+      #- JWT_IN_BODY=true
+    ports:
+      - '80:80'
+      - '443:443'
     stdin_open: true
+    restart: always
     stop_grace_period: 60s
     volumes:
-      - /var/www/onlyoffice/Data
-      - /var/log/onlyoffice
-      - /var/lib/onlyoffice/documentserver/App_Data/cache/files
-      - /var/www/onlyoffice/documentserver-example/public/files
-      - /usr/share/fonts
-    networks:
-      - database
-      - nextcloud
-      - onlyoffice
-    restart: unless-stopped
+       - /var/www/onlyoffice/Data
+       - /var/log/onlyoffice
+       - /var/lib/onlyoffice/documentserver/App_Data/cache/files
+       - /var/www/onlyoffice/documentserver-example/public/files
+       - /usr/share/fonts
 
   onlyoffice-rabbitmq:
     container_name: onlyoffice-rabbitmq
     image: rabbitmq
-    restart: unless-stopped
+    restart: always
     expose:
       - '5672'
-    networks:
-      - onlyoffice
 
-networks:
-  database:
-    external: true
-  nextcloud:
-    external: true
-  onlyoffice:
-    name: onlyoffice
+  onlyoffice-postgresql:
+    container_name: onlyoffice-postgresql
+    image: postgres:12
+    environment:
+      - POSTGRES_DB=onlyoffice
+      - POSTGRES_USER=onlyoffice
+      - POSTGRES_HOST_AUTH_METHOD=trust
+    restart: always
+    expose:
+      - '5432'
+    volumes:
+      - postgresql_data:/var/lib/postgresql
+
+volumes:
+  postgresql_data: