diff --git a/audiobookshelf/docker-compose.yml b/audiobookshelf/docker-compose.yml
index d4462a8..27f2a43 100644
--- a/audiobookshelf/docker-compose.yml
+++ b/audiobookshelf/docker-compose.yml
@@ -1,6 +1,7 @@
 services:
   audiobookshelf:
     image: ghcr.io/advplyr/audiobookshelf:2.29.0
+    restart: always
     ports:
       - 13378:80
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index 5a6f0b0..5431c02 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,6 @@ include:
   - pingvin/docker-compose.yml
   - pocketid/docker-compose.yml
   - postgres/docker-compose.yml
-  - searxng/docker-compose.yml
   - spliit/docker-compose.yml
   - shlink/docker-compose.yml
   - synapse/docker-compose.yml
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 8866713..0d87aac 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -15,6 +15,7 @@ services:
       - "2222:2222"
   gitea-runner:
     image: gitea/act_runner:0.2.13
+    restart: always
     environment:
       CONFIG_FILE: /config.yaml
       GITEA_INSTANCE_URL: "${GITEA_INSTANCE_URL}"
diff --git a/jellyfin/docker-compose.yml b/jellyfin/docker-compose.yml
index 73f5db4..83504f5 100644
--- a/jellyfin/docker-compose.yml
+++ b/jellyfin/docker-compose.yml
@@ -3,7 +3,7 @@ services:
     image: jellyfin/jellyfin:10.10.7
     user: ${JELLYFIN_USER_UID}:${JELLYFIN_USER_GID}
     network_mode: 'host'
-    restart: 'unless-stopped'
+    restart: always
     env_file:
       - .env
     environment:
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index a49f22c..44a0b52 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   nextcloud_db:
     image: docker.io/library/postgres:17
-    restart: unless-stopped
+    restart: always
     volumes:
       - ${NEXTCLOUD_POSTGRES_DATA_DIR}:/var/lib/postgresql/data
     environment:
@@ -37,7 +37,7 @@ services:
     volumes:
       - ${NEXTCLOUD_DATA_DIR}:/var/www/html
     entrypoint: /cron.sh
-    restart: unless-stopped
+    restart: always
     networks:
       - nextcloud
   nextcloud-redis:
diff --git a/paperless/docker-compose.yml b/paperless/docker-compose.yml
index ddb7acd..48c8e70 100644
--- a/paperless/docker-compose.yml
+++ b/paperless/docker-compose.yml
@@ -1,13 +1,13 @@
 services:
   broker:
     image: docker.io/library/redis:7
-    restart: unless-stopped
+    restart: always
     volumes:
       - ${PAPERLESS_REDIS_DATA_DIR}:/data
 
   db:
     image: docker.io/library/postgres:17
-    restart: unless-stopped
+    restart: always
     volumes:
       - ${PAPERLESS_POSTGRES_DATA_DIR}:/var/lib/postgresql/data
     environment:
@@ -19,7 +19,7 @@ services:
 
   paperless:
     image: ghcr.io/paperless-ngx/paperless-ngx:2.18.4
-    restart: unless-stopped
+    restart: always
     depends_on:
       - db
       - broker
@@ -50,7 +50,7 @@ services:
 
   gotenberg:
     image: docker.io/gotenberg/gotenberg:8.23.1
-    restart: unless-stopped
+    restart: always
 
     # The gotenberg chromium route is used to convert .eml files. We do not
     # want to allow external content like tracking pixels or even javascript.
@@ -61,4 +61,4 @@ services:
 
   tika:
     image: docker.io/apache/tika:3.2.3.0
-    restart: unless-stopped
+    restart: always
diff --git a/pihole/docker-compose.yml b/pihole/docker-compose.yml
index 816d671..7d60e20 100644
--- a/pihole/docker-compose.yml
+++ b/pihole/docker-compose.yml
@@ -34,4 +34,4 @@ services:
 #      - SYS_TIME
       # Optional, if Pi-hole should get some more processing time
       - SYS_NICE
-    restart: unless-stopped
\ No newline at end of file
+    restart: always
\ No newline at end of file
diff --git a/pingvin/docker-compose.yml b/pingvin/docker-compose.yml
index d1af57e..63a616d 100644
--- a/pingvin/docker-compose.yml
+++ b/pingvin/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   pingvin:
     image: stonith404/pingvin-share:v1.13.0
-    restart: unless-stopped
+    restart: always
     ports:
       - 3042:3000
     environment:
diff --git a/pocketid/docker-compose.yml b/pocketid/docker-compose.yml
index a80e8c1..8d672e3 100644
--- a/pocketid/docker-compose.yml
+++ b/pocketid/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   pocket-id:
     image: ghcr.io/pocket-id/pocket-id:v1.11.2
-    restart: unless-stopped
+    restart: always
     env_file: .env
     ports:
       - "3043:1411"
diff --git a/searxng/.env.example b/searxng/.env.example
deleted file mode 100644
index 6e6fa63..0000000
--- a/searxng/.env.example
+++ /dev/null
@@ -1,2 +0,0 @@
-SEARXNG_CONFIG_DIR=
-SEARXNG_DATA_DIR=
\ No newline at end of file
diff --git a/searxng/docker-compose.yml b/searxng/docker-compose.yml
deleted file mode 100644
index ccc51b0..0000000
--- a/searxng/docker-compose.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-services:
-  searxng:
-    container_name: searxng
-    image: docker.io/searxng/searxng:latest
-    restart: unless-stopped
-    env_file: .env
-    ports:
-      - "8888:8080"
-    volumes:
-      - ${SEARXNG_CONFIG_DIR}:/etc/searxng/
-      - ${SEARXNG_DATA_DIR}:/var/cache/searxng/
\ No newline at end of file
diff --git a/shlink/docker-compose.yml b/shlink/docker-compose.yml
index c4e4baf..4a83155 100644
--- a/shlink/docker-compose.yml
+++ b/shlink/docker-compose.yml
@@ -2,7 +2,7 @@ services:
   shlink:
     image: shlinkio/shlink:4.5
     container_name: shlink
-    restart: unless-stopped
+    restart: always
     ports:
       - "8085:8080"
     environment:
@@ -20,7 +20,7 @@ services:
   shlink_db:
     image: postgres:17
     container_name: shlink_db
-    restart: unless-stopped
+    restart: always
     volumes:
       - ${SHLINK_POSTGRES_DIR}:/var/lib/postgresql/data
     environment:
diff --git a/spliit/docker-compose.yml b/spliit/docker-compose.yml
index 8e42fa6..372016d 100644
--- a/spliit/docker-compose.yml
+++ b/spliit/docker-compose.yml
@@ -1,6 +1,7 @@
 services:
   spliit:
     image: ghcr.io/spliit-app/spliit:1.18.0
+    restart: always
     ports:
       - 3001:3000
     depends_on:
@@ -15,6 +16,7 @@ services:
       POSTGRES_PASSWORD: ${SPLIIT_POSTGRES_PASSWORD}
   spliit_db:
     image: postgres:17
+    restart: always
     volumes:
       - ${SPLIIT_POSTGRES_DIR}:/var/lib/postgresql/data
     ports:
diff --git a/synapse/docker-compose.yml b/synapse/docker-compose.yml
index f885a74..9c2ceb4 100644
--- a/synapse/docker-compose.yml
+++ b/synapse/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - LIVEKIT_KEY=devkey
       - LIVEKIT_SECRET=${LIVEKIT_SECRET_KEY}
       - LIVEKIT_FULL_ACCESS_HOMESERVERS=${MATRIX_DOMAIN} 
-    restart: unless-stopped
+    restart: always
     ports:
       - 8071:8080
   element-call-livekit:
@@ -20,18 +20,18 @@ services:
       - "7881:7881/tcp"
       - "7882:7882/tcp"
       - "50100-50200:50100-50200/udp"
-    restart: unless-stopped
+    restart: always
     volumes:
       - ${LIVEKIT_CONFIG_DIR}/config.yaml:/etc/livekit.yaml:ro
   mautrix-signal:
     container_name: mautrix-signal
     image: dock.mau.dev/mautrix/signal:v0.8.7
-    restart: unless-stopped
+    restart: always
     volumes:
       - ${MAUTRIX_SIGNAL_DATA_DIR}:/data
   mautrix-signal_db:
     image: docker.io/library/postgres:17
-    restart: unless-stopped
+    restart: always
     volumes:
       - ${MAUTRIX_SIGNAL_POSTGRES_DATA_DIR}:/var/lib/postgresql/data
     environment:
@@ -44,14 +44,14 @@ services:
     container_name: mautrix-whatsapp
     image: dock.mau.dev/mautrix/whatsapp:v0.12.5
     #image: petersmit27/mautrix-whatsapp:latest
-    restart: unless-stopped
+    restart: always
     volumes:
       - ${MAUTRIX_WHATSAPP_DATA_DIR}:/data
     depends_on:
       - mautrix-whatsapp_db
   mautrix-whatsapp_db:
     image: docker.io/library/postgres:17
-    restart: unless-stopped
+    restart: always
     volumes:
       - ${MAUTRIX_WHATSAPP_POSTGRES_DATA_DIR}:/var/lib/postgresql/data
     environment:
@@ -62,7 +62,7 @@ services:
       - 5440:5432
   mas:
     image: ghcr.io/element-hq/matrix-authentication-service:1.3.0
-    restart: unless-stopped
+    restart: always
     working_dir: /config
     volumes:
       - ${MAS_CONFIG_DIR}:/config
@@ -74,7 +74,7 @@ services:
       - mas_db
   mas_db:
     image: docker.io/library/postgres:17
-    restart: unless-stopped
+    restart: always
     volumes:
       - ${MAS_POSTGRES_DATA_DIR}:/var/lib/postgresql/data
     environment:
@@ -85,7 +85,7 @@ services:
       - 5441:5432
   synapse_db:
     image: docker.io/library/postgres:17
-    restart: unless-stopped
+    restart: always
     volumes:
       - ${SYNAPSE_POSTGRES_DATA_DIR}:/var/lib/postgresql/data
     environment:
@@ -98,7 +98,7 @@ services:
   synapse:
     container_name: synapse
     image: matrixdotorg/synapse:v1.138.2
-    restart: unless-stopped
+    restart: always
     volumes:
       - ${SYNAPSE_CONFIG_DIR}:/data
     ports: