diff --git a/arr/compose.yml b/arr/compose.yml
index 0acd11e..96c0ec5 100644
--- a/arr/compose.yml
+++ b/arr/compose.yml
@@ -24,6 +24,8 @@ services:
       - PUID=1029
       - PGID=1000
       - TZ=Etc/UTC
+    ports:
+      - "7878:7878"
     volumes:
       - /home/fejy/docker/radarr:/config
       - /mnt/LUXURIA/Share:/Share
@@ -44,6 +46,8 @@ services:
       - PUID=1029
       - PGID=1000
       - TZ=Etc/UTC
+    ports:
+      - "8989:8989"
     volumes:
       - /home/fejy/docker/sonarr:/config
       - /mnt/LUXURIA/Share:/Share
diff --git a/dozzle/compose.yml b/dozzle/compose.yml
index 32681dd..40ad5f5 100644
--- a/dozzle/compose.yml
+++ b/dozzle/compose.yml
@@ -1,6 +1,7 @@
 services:
   dozzle:
     image: amir20/dozzle:latest
+    restart: unless-stopped
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /home/fejy/docker/dozzle_data:/data
diff --git a/ersatztv/compose.yml b/ersatztv/compose.yml
index 481ba54..2c5b11c 100644
--- a/ersatztv/compose.yml
+++ b/ersatztv/compose.yml
@@ -2,6 +2,8 @@ services:
   ersatztv:
     image: ghcr.io/ersatztv/ersatztv
     container_name: ersatztv
+    ports:
+      - "8409:8409"
     environment:
       - TZ=America/New_York
     volumes:
diff --git a/excalidraw/compose.yml b/excalidraw/compose.yml
index 46914ca..a392d3b 100644
--- a/excalidraw/compose.yml
+++ b/excalidraw/compose.yml
@@ -5,7 +5,7 @@ services:
     environment:
       - PUID=1029
       - PGID=1000
-    restart: on-failure
+    restart: unless-stopped
     networks:
       - proxy
     labels:
diff --git a/homepage/compose.yml b/homepage/compose.yml
index 1850484..796ca87 100644
--- a/homepage/compose.yml
+++ b/homepage/compose.yml
@@ -5,12 +5,12 @@ services:
     env_file: ".env"
     environment:
       PUID: 1029
-      PGID: 1000
+      PGID: 988
       HOMEPAGE_ALLOWED_HOSTS: home.nearfuture
     volumes:
       - /home/fejy/docker/homepage/config:/app/config
       - /home/fejy/docker/homepage/icons:/app/public/icons
-        # - /var/run/docker.sock:/var/run/docker.sock:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
     restart: unless-stopped
     networks:
       - proxy
diff --git a/matrix-bots/compose.yml b/matrix-bots/compose.yml
index 5a07382..b1edd7d 100644
--- a/matrix-bots/compose.yml
+++ b/matrix-bots/compose.yml
@@ -1,6 +1,7 @@
 services:
   matrix-registration-bot:
     image: moanos/matrix-registration-bot:latest
+    restart: unless-stopped
     environment:
       LOGGING_LEVEL: DEBUG
       BOT_SERVER: "https://nearfuture.industries"
diff --git a/pinchflat/compose.yml b/pinchflat/compose.yml
index 64bd93a..0e3e162 100644
--- a/pinchflat/compose.yml
+++ b/pinchflat/compose.yml
@@ -2,6 +2,7 @@ services:
   pinchflat:
     image: ghcr.io/kieraneglin/pinchflat:latest
     container_name: pinchflat
+    restart: unless-stopped
     environment:
       - TZ=America/New_York
     volumes:
diff --git a/scrutiny/compose.yml b/scrutiny/compose.yml
index faf2971..0e3b7de 100644
--- a/scrutiny/compose.yml
+++ b/scrutiny/compose.yml
@@ -41,27 +41,6 @@ services:
       - "traefik.http.routers.scrutiny.entryPoints=web"
       - "traefik.http.routers.scrutiny.rule=Host(`scrutiny.nearfuture`)"
 
-  collector:
-    restart: unless-stopped
-    image: 'ghcr.io/analogj/scrutiny:v0.8-collector'
-    cap_add:
-      - SYS_RAWIO
-    volumes:
-      - '/run/udev:/run/udev:ro'
-    environment:
-      COLLECTOR_API_ENDPOINT: 'http://web:8080'
-      COLLECTOR_HOST_ID: 'Invidia'
-      # If true forces the collector to run on startup (cron will be started after the collector completes)
-      # see: https://github.com/AnalogJ/scrutiny/blob/master/docs/TROUBLESHOOTING_DEVICE_COLLECTOR.md#collector-trigger-on-startup
-      COLLECTOR_RUN_STARTUP: true
-    depends_on:
-      web:
-        condition: service_healthy
-    networks:
-      - scrutiny
-    devices:
-      - "/dev/sda:/dev/sda"
-
 networks:
   proxy:
     external: true
diff --git a/watchtower/compose.yml b/watchtower/compose.yml
index 455b819..f1900f5 100644
--- a/watchtower/compose.yml
+++ b/watchtower/compose.yml
@@ -1,10 +1,12 @@
 version: '3'
 services:
   watchtower:
-    image: containrrr/watchtower
+    image: nickfedor/watchtower
     container_name: watchtower
     command: --cleanup=true --scope watch
-    restart: always
+    restart: unless-stopped
+    environment:
+      - DOCKER_API_VERSION="1.49"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     labels: