diff --git a/element/docker-compose.yml b/element/docker-compose.yml
index 32151f0..3d4e3eb 100644
--- a/element/docker-compose.yml
+++ b/element/docker-compose.yml
@@ -1,9 +1,9 @@
 version: '2.4'
 services:
-  mariadb:
-    image: vectorim/element-web
+  element:
+    image: vectorim/element-web:v1.7.23
+    restart: unless-stopped
     volumes:
       - ./config.json:/app/config.json
     ports:
-      - 8083:80
-    
\ No newline at end of file
+      - 8083:80
\ No newline at end of file
diff --git a/mautrix-signal/docker-compose.yml b/mautrix-signal/docker-compose.yml
index 5d9ef1d..767fb6f 100644
--- a/mautrix-signal/docker-compose.yml
+++ b/mautrix-signal/docker-compose.yml
@@ -20,4 +20,4 @@ networks:
     driver: bridge
   postgres_net:
     name: postgres_net
-    external: true
+    external: true
\ No newline at end of file
diff --git a/mautrix-telegram/docker-compose.yml b/mautrix-telegram/docker-compose.yml
index 5ad22c9..570de12 100644
--- a/mautrix-telegram/docker-compose.yml
+++ b/mautrix-telegram/docker-compose.yml
@@ -11,6 +11,4 @@ services:
 networks:
   matrix_net:
     name: matrix_net
-    driver: bridge
-  
-    
\ No newline at end of file
+    driver: bridge
\ No newline at end of file
diff --git a/mautrix-whatsapp/docker-compose.yml b/mautrix-whatsapp/docker-compose.yml
index d012fd9..06cf499 100644
--- a/mautrix-whatsapp/docker-compose.yml
+++ b/mautrix-whatsapp/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2.4'
 services:
   mautrix-whatsapp:
-    image: dock.mau.dev/tulir/mautrix-whatsapp:latest
+    image: dock.mau.dev/tulir/mautrix-whatsapp:v0.1.5
     restart: unless-stopped
     volumes:
     - /var/mautrix-whatsapp:/data
@@ -11,5 +11,4 @@ services:
 networks:
   matrix_net:
     name: matrix_net
-    driver: bridge
-  
\ No newline at end of file
+    driver: bridge
\ No newline at end of file
diff --git a/minecraft/docker-compose.yml b/minecraft/docker-compose.yml
index 295d647..9feb9ec 100644
--- a/minecraft/docker-compose.yml
+++ b/minecraft/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   minecraft:
     build:
       context: .
-    restart: always
+    restart: unless-stopped
     volumes:
       - /var/minecraft/world:/minecraft/world
       - /var/minecraft/ops.json:/minecraft/ops.json
@@ -19,4 +19,4 @@ services:
       MAX_PLAYERS: "20"
       ENABLED_WHITELIST: "true"
     ports:
-      - 25565:25565
+      - 25565:25565
\ No newline at end of file
diff --git a/minecraft/docker-entrypoint.sh b/minecraft/docker-entrypoint.sh
old mode 100755
new mode 100644
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index 3115aa0..f70dc97 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -1,7 +1,15 @@
 version: '2.4'
 services:
+  redis:
+    image: redis:6.2.0
+    restart: unless-stopped
+    volumes:
+      - /var/redis:/data
+    networks:
+      - "nextcloud_net"
   nextcloud:
-    image: nextcloud:fpm
+    build: ./nextcloud-fpm
+    restart: unless-stopped
     environment:
       POSTGRES_DB: nextcloud
       POSTGRES_USER: nextcloud
@@ -13,14 +21,17 @@ services:
       OVERWRITEPROTOCOL: "https"
       OVERWRITEWEBROOT: "/"
       OVERWRITECONADDR: "138.201.74.231"
+      REDIS_HOST: redis
     networks:
       - "postgres_net"
       - "nextcloud_net"
     volumes:
       - /var/nextcloud:/var/www/html
+      - /mnt/mathias:/mnt/mathias
+      - /mnt/public:/mnt/public
   web:
     image: nginx
-    restart: always
+    restart: unless-stopped
     ports:
       - 8081:80
     networks:
@@ -35,4 +46,4 @@ networks:
     driver: bridge
   postgres_net:
     name: "postgres_net"
-    external: true
+    external: true
\ No newline at end of file
diff --git a/nummus/docker-compose.yml b/nummus/docker-compose.yml
index ccfa630..cbaa8c0 100644
--- a/nummus/docker-compose.yml
+++ b/nummus/docker-compose.yml
@@ -2,6 +2,7 @@ version: '2.4'
 services:
   nummus:
     image: glenroy37/nummus:0.1.2-alpha
+    restart: unless-stopped
     environment:
       DB_HOST: postgres
       DB_USER: nummus
@@ -17,4 +18,4 @@ services:
 networks:
   mariadb_net:
     name: "postgres_net"
-    external: true
+    external: true
\ No newline at end of file
diff --git a/postgres/docker-compose.yml b/postgres/docker-compose.yml
index 329aa0f..85383a7 100644
--- a/postgres/docker-compose.yml
+++ b/postgres/docker-compose.yml
@@ -2,6 +2,7 @@ version: '2.4'
 services:
   postgres:
     image: postgres:13.1-alpine
+    restart: unless-stopped
     environment:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       PGDATA: /var/lib/postgresql/data/pgdata
@@ -14,4 +15,4 @@ services:
 networks:
   postgres_net:
     name: postgres_net
-    driver: bridge
+    driver: bridge
\ No newline at end of file
diff --git a/synapse/docker-compose.yml b/synapse/docker-compose.yml
index a95a723..87289dc 100644
--- a/synapse/docker-compose.yml
+++ b/synapse/docker-compose.yml
@@ -1,8 +1,8 @@
 version: '2.4'
 services:
   synapse:
-    image: matrixdotorg/synapse:v1.26.0-deb
-    restart: always
+    image: matrixdotorg/synapse:v1.28.0
+    restart: unless-stopped
     healthcheck:
       test: ["CMD", "curl", "-fSs", "http://localhost:8008/health"]
       interval: 1m
@@ -27,4 +27,4 @@ networks:
         driver: bridge
     postgres_net:
         name: postgres_net
-        external: true
\ No newline at end of file
+        external: true
diff --git a/ufw/playbook-ufw.yml b/ufw/playbook-ufw.yml
index 256d90b..26b2424 100644
--- a/ufw/playbook-ufw.yml
+++ b/ufw/playbook-ufw.yml
@@ -67,4 +67,3 @@
     community.general.ufw:
       state: enabled
       policy: deny
-