diff --git a/gitea/.env.example b/gitea/.env.example
new file mode 100644
index 0000000..ae63ecc
--- /dev/null
+++ b/gitea/.env.example
@@ -0,0 +1,7 @@
+GITEA_HOSTNAME=localhost
+GITEA_WEB_PORT=3000
+GITEA_SSH_PORT=22
+MYSQL_ROOT_PASSWORD=password
+MYSQL_DATABASE=database
+MYSQL_USER=user
+MYSQL_PASSWORD=password
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 555c9f0..4687f28 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     links:
       - db:mysql
     volumes:
-      - /var/docker_data/gitea:/data
+      - /docker/data/gitea/gitea:/data
     ports:
       - "${GITEA_SSH_PORT}:22"
       - "${GITEA_WEB_PORT}:3000"
@@ -23,12 +23,12 @@ services:
   db:
     container_name: gitea-db
     restart: unless-stopped
-    image: mysql:8.0
+    image: mysql:8
     #security_opt:
     #  - seccomp:unconfined
     cap_add: [ SYS_NICE ]
     volumes:
-      - /var/docker_data/gitea_db:/var/lib/mysql
+      - /docker/data/gitea/gitea_db:/var/lib/mysql
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - MYSQL_DATABASE=${MYSQL_DATABASE}
diff --git a/nextcloud/.env.example b/nextcloud/.env.example
new file mode 100644
index 0000000..ce4ab58
--- /dev/null
+++ b/nextcloud/.env.example
@@ -0,0 +1,5 @@
+MYSQL_ROOT_PASSWORD=password
+MYSQL_PASSWORD=password
+MYSQL_DATABASE=database
+MYSQL_USER=user
+OVERWRITEHOST=nextcloud.domain.com
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index ff78eb1..b446cd3 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3' 
-
 services:
   db:
     image: mariadb
@@ -9,16 +7,16 @@ services:
       - nextcloud_network
     volumes:
       - db:/var/lib/mysql
-      - /etc/localtime:/etc/localtime:ro
+        #- /etc/localtime:/etc/localtime:ro
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - MYSQL_DATABASE=${MYSQL_DATABASE}
       - MYSQL_USER=${MYSQL_USER}
     restart: unless-stopped
-  
+
   app:
-    image: nextcloud:latest
+    image: nextcloud:30.0.5
     container_name: nextcloud-app
     networks:
       - nextcloud_network
@@ -31,11 +29,11 @@ services:
       - OVERWRITEPROTOCOL=https
     volumes:
       - nextcloud:/var/www/html
-      - ./app/config:/var/www/html/config
-      - ./app/custom_apps:/var/www/html/custom_apps
-      - /media/nextcloud:/var/www/html/data
-      - ./app/themes:/var/www/html/themes
-      - /etc/localtime:/etc/localtime:ro
+      - /docker/data/nextcloud/app/config:/var/www/html/config
+      - /docker/data/nextcloud/app/custom_apps:/var/www/html/custom_apps
+      - /docker/data/nextcloud/app/themes:/var/www/html/themes
+      - /docker/data/nextcloud/data:/var/www/html/data
+        #- /etc/localtime:/etc/localtime:ro
     restart: unless-stopped
 
 volumes:
diff --git a/synapse/.env.example b/synapse/.env.example
new file mode 100644
index 0000000..d6def13
--- /dev/null
+++ b/synapse/.env.example
@@ -0,0 +1,3 @@
+POSTGRES_PASSWORD=password
+POSTGRES_USER=user
+HOST=matrix.domain.com
diff --git a/synapse/docker-compose.yml b/synapse/docker-compose.yml
index 5675be9..7be80b9 100644
--- a/synapse/docker-compose.yml
+++ b/synapse/docker-compose.yml
@@ -6,20 +6,21 @@ services:
     container_name: synapse-postgres
     restart: unless-stopped
     volumes:
-      - ./postgres/dbscripts/init-db.sql:/docker-entrypoint-initdb.d/init.sql
-      - ./postgres/data:/var/lib/postgres
+      - /docker/data/synapse/postgresql/data:/var/lib/postgresql/data
     environment:
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      #- POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C
     networks:
       - synapsenet
 
   synapse:
     container_name: synapse
     image: matrixdotorg/synapse
+    user: 911:911
     restart: unless-stopped
     volumes:
-      - /var/docker_data/matrix:/data
+      - /docker/data/synapse/data:/data
     ports:
       - "8008:8008"
       - "8449:8448"
@@ -28,34 +29,36 @@ services:
       - "traefik.port=8008"
       - "traefik.backend=matrix_app"
       - "traefik.frontend.rule=Host:${HOST}"
+    depends_on:
+      - postgres
     networks:
       - synapsenet
-
+  
   mautrix-instagram:
     container_name: mautrix-instagram
     image: dock.mau.dev/mautrix/instagram:latest
     restart: unless-stopped
     volumes:
-      - ./mautrix-insta:/data
+      - /docker/data/mautrix/insta:/data
     depends_on:
       - synapse
     networks:
       - synapsenet
-    links:
-      - synapse
+        #links:
+        #- synapse
 
   mautrix-whatsapp:
     container_name: mautrix-whatsapp
     image: dock.mau.dev/mautrix/whatsapp:latest
     restart: unless-stopped
     volumes:
-      - ./mautrix-whatsapp:/data
+      - /docker/data/mautrix/whatsapp:/data
     depends_on:
       - synapse
     networks:
       - synapsenet
-    links:
-      - synapse
-
+        #links:
+        #- synapse
+        
 networks:
   synapsenet:
diff --git a/wireguard/.env.example b/wireguard/.env.example
new file mode 100644
index 0000000..f99a765
--- /dev/null
+++ b/wireguard/.env.example
@@ -0,0 +1 @@
+SERVER_URL=vpn.domain.com
diff --git a/wireguard/docker-compose.yml b/wireguard/docker-compose.yml
index ffb021b..e9f45c8 100644
--- a/wireguard/docker-compose.yml
+++ b/wireguard/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "2.1"
 services:
   wireguard:
     image: lscr.io/linuxserver/wireguard:latest
@@ -12,14 +11,14 @@ services:
       - TZ=${TZ}
       - SERVERURL=${SERVER_URL} #optional
       - SERVERPORT=51820 #optional
-      - PEERS=2 #optional
+      - PEERS=7 #optional
       - PEERDNS=auto #optional
       - INTERNAL_SUBNET=10.13.13.0 #optional
       - ALLOWEDIPS=0.0.0.0/0 #optional
       - PERSISTENTKEEPALIVE_PEERS= #optional
       - LOG_CONFS=true #optional
     volumes:
-      - /docker/wireguard/config:/config
+      - /docker/data/wireguard/config:/config
       - /lib/modules:/lib/modules #optional
     ports:
       - 51820:51820/udp