diff --git a/docker-compose.yml b/docker-compose.yml
index 761b5a6..25f60f3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,33 +21,33 @@ services:
       - TZ=${TZ}
     ports:
       - 6767:6767
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/bazarr/config:/config
       - ${MEDIA_DIR}:/media
 
-  bitwarden:
-    container_name: bitwarden
-    image: vaultwarden/server:latest
-    environment:
-      - TZ=${TZ}
-      - ADMIN_TOKEN=x/7NNVrKQ4DwYhUGgZjMNWiZG32GZGH149xG2C8gYgIWkRDSOJvgpu4eNKsgt0Wf
-      - DATABASE_URL=data/db.sqlite3
-      - DISABLE_ADMIN_TOKEN=true
-      - DOMAIN=https://bitwarden.wettsten.com
-      - ENABLE_DB_WAL=true
-      - INVITATIONS_ALLOWED=false
-      - SHOW_PASSWORD_HINT=false
-      - SIGNUPS_ALLOWED=false
-      - SIGNUPS_VERIFY=false
-      - SMTP_PORT=587
-      - SMTP_SSL=true
-    ports:
-      - 8089:80/tcp
-    restart: none
-    volumes:
-      - ./appdata/vaultwarden/data:/data
-      - /etc/localtime:/etc/localtime:ro
+#  bitwarden:
+#    container_name: bitwarden
+#    image: vaultwarden/server:latest
+#    environment:
+#      - TZ=${TZ}
+#      - ADMIN_TOKEN=x/7NNVrKQ4DwYhUGgZjMNWiZG32GZGH149xG2C8gYgIWkRDSOJvgpu4eNKsgt0Wf
+#      - DATABASE_URL=data/db.sqlite3
+#      - DISABLE_ADMIN_TOKEN=true
+#      - DOMAIN=https://bitwarden.wettsten.com
+#      - ENABLE_DB_WAL=true
+#      - INVITATIONS_ALLOWED=false
+#      - SHOW_PASSWORD_HINT=false
+#      - SIGNUPS_ALLOWED=false
+#      - SIGNUPS_VERIFY=false
+#      - SMTP_PORT=587
+#      - SMTP_SSL=true
+#    ports:
+#      - 8089:80/tcp
+#    restart: always
+#    volumes:
+#      - ./appdata/vaultwarden/data:/data
+#      - /etc/localtime:/etc/localtime:ro
 
   ddclient:
     container_name: ddclient
@@ -56,7 +56,7 @@ services:
       - PUID=${PUID}
       - PGID=${PGID}
       - TZ=${TZ}
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/ddclient/config:/config
 
@@ -85,7 +85,7 @@ services:
       - 8282:8282/tcp # qBittorrent
       - 56577:6881/tcp # qBittorrent
       - 56577:6881/udp # qBittorrent
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/gluetun:/gluetun
 
@@ -100,7 +100,7 @@ services:
       - AUTO_UPDATE=true
     ports:
       - 9117:9117/tcp
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/jackett/config:/config
       - ${MEDIA_DIR}/downloads:/downloads
@@ -120,7 +120,7 @@ services:
 #      - MYJD_PASSWORD=
 #      - MYJD_DEVICE_NAME=dockerserver
     network_mode: "service:gluetun"
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/jdownloader/config:/config
       - ${MEDIA_DIR}/downloads/jdownloader:/downloads
@@ -136,7 +136,7 @@ services:
       - JELLYFIN_PublishedServerUrl=192.168.1.247
     ports:
       - 8096:8096
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/jellyfin/config:/config
       - ${MEDIA_DIR}/tvshows:/tvshows
@@ -151,7 +151,7 @@ services:
       - TZ=${TZ}
     ports:
       - 8686:8686
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/lidarr/config:/config
       - ${MEDIA_DIR}/music/Albums:/music
@@ -166,7 +166,7 @@ services:
       - PGID=${PGID}
     ports:
       - 8082:8081
-    restart: unless-stopped
+    restart: always
     volumes:
       - ${MEDIA_DIR}/downloads/youtubedl:/downloads
       - ./appdata/metube:/config
@@ -180,7 +180,7 @@ services:
       - TZ=${TZ}
     ports:
       - 8084:80/tcp
-    restart: unless-stopped
+    restart: always
     volumes:
       - ${MEDIA_DIR}:/HD:ro
       - ./appdata/monitorr/app:/app
@@ -196,7 +196,7 @@ services:
       - TZ=${TZ}
     ports:
       - 3001:3000
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/mstream:/config
       - ${MEDIA_DIR}/music:/music
@@ -227,7 +227,7 @@ services:
       - TZ=${TZ}
     ports:
       - 5076:5076
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/nzbhydra/config:/config
       - ${MEDIA_DIR}/downloads:/downloads
@@ -238,7 +238,7 @@ services:
     user: root
     ports:
       - 1337:1337
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/olivetin/config:/config
       - /var/run/docker.sock:/var/run/docker.sock
@@ -252,7 +252,7 @@ services:
       - FPM=true
     ports:
       - 8085:80/tcp
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/organizr/config:/config
       - /etc/localtime:/etc/localtime:ro
@@ -265,26 +265,26 @@ services:
       - TZ=${TZ}
     ports:
       - 5055:5055
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/overseerr/config:/app/config
       - /etc/localtime:/etc/localtime:ro
 
-  plex:
-    container_name: plex
-    image: lscr.io/linuxserver/plex:latest
-    network_mode: host
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - TZ=${TZ}
-      - VERSION=docker
-      - PLEX_CLAIM= #optional
-    restart: none
-    volumes:
-      - ./appdata/plex/config:/config
-      - ${MEDIA_DIR}/tvshows:/tvshows
-      - ${MEDIA_DIR}/movies:/movies
+#  plex:
+#    container_name: plex
+#    image: lscr.io/linuxserver/plex:latest
+#    network_mode: host
+#    environment:
+#      - PUID=${PUID}
+#      - PGID=${PGID}
+#      - TZ=${TZ}
+#      - VERSION=docker
+#      - PLEX_CLAIM= #optional
+#    restart: always
+#    volumes:
+#      - ./appdata/plex/config:/config
+#      - ${MEDIA_DIR}/tvshows:/tvshows
+#      - ${MEDIA_DIR}/movies:/movies
 
   prowlarr:
     container_name: prowlarr
@@ -295,7 +295,7 @@ services:
       - TZ=${TZ}
     ports:
       - 9696:9696
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/prowlarr/config:/config
 
@@ -308,7 +308,7 @@ services:
       - TZ=${TZ}
       - WEBUI_PORT=8282
     network_mode: "service:gluetun"
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/qbittorrent/config:/config
       - ${MEDIA_DIR}:/media
@@ -323,7 +323,7 @@ services:
       - TZ=${TZ}
     ports:
       - 7878:7878
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/radarr:/config
       - ${MEDIA_DIR}:/media
@@ -336,7 +336,7 @@ services:
       - PGID=${PGID}
       - TZ=${TZ}
     network_mode: "service:gluetun"
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/sabnzbd:/config
       - ${MEDIA_DIR}:/media
@@ -351,7 +351,7 @@ services:
       - TZ=${TZ}
     ports:
       - 8989:8989
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./appdata/sonarr/config:/config
       - ${MEDIA_DIR}:/media