diff --git a/caddy/docker-compose.yml b/caddy/docker-compose.yml
index 5a3fb04..2ad5a1c 100644
--- a/caddy/docker-compose.yml
+++ b/caddy/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       #command: tunnel login
       #command: tunnel create tunnel_ccalifice
       command: tunnel --no-autoupdate run
-      restart: always
+      restart: unless-stopped
       networks:
         - caddy-net
 
diff --git a/firefly-iii/docker-compose.yml b/firefly-iii/docker-compose.yml
index 5729b4b..07230b8 100644
--- a/firefly-iii/docker-compose.yml
+++ b/firefly-iii/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     container_name: firefly_iii_core
     networks:
       - firefly_iii
-    restart: always
+    restart: unless-stopped
     volumes:
       - ./firefly_iii_upload:/var/www/html/storage/upload
     env_file: .env
@@ -27,7 +27,7 @@ services:
     container_name: firefly_iii_db
     networks:
       - firefly_iii
-    restart: always
+    restart: unless-stopped
     env_file: .db.env
     volumes:
       - ./firefly_iii_db:/var/lib/mysql
@@ -35,7 +35,7 @@ services:
   importer:
     image: fireflyiii/data-importer:latest
     hostname: importer
-    restart: always
+    restart: unless-stopped
     container_name: firefly_iii_importer
     networks:
       - firefly_iii
@@ -48,7 +48,7 @@ services:
   importer_mor:
     image: fireflyiii/data-importer:latest
     hostname: importer
-    restart: always
+    restart: unless-stopped
     container_name: firefly_iii_importer_mor
     networks:
       - firefly_iii
@@ -65,7 +65,7 @@ services:
     #
     image: alpine
     container_name: firefly_iii_cron
-    restart: always
+    restart: unless-stopped
     command: sh -c "echo \"0 3 * * * wget -qO- http://app:8080/api/v1/cron/REPLACEME\" | crontab - && crond -f -L /dev/stdout"
     networks:
       - firefly_iii
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 4e1da81..83631dc 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - GITEA__database__NAME=gitea
       - GITEA__database__USER=gitea
       - GITEA__database__PASSWD=gitea
-    restart: always
+    restart: unless-stopped
     networks:
       - gitea
     volumes:
@@ -29,7 +29,7 @@ services:
 
   db:
     image: docker.io/library/postgres:14
-    restart: always
+    restart: unless-stopped
     environment:
       - POSTGRES_USER=gitea
       - POSTGRES_PASSWORD=gitea
diff --git a/guacamole/docker-compose.yml b/guacamole/docker-compose.yml
index f8604b3..02b01dc 100644
--- a/guacamole/docker-compose.yml
+++ b/guacamole/docker-compose.yml
@@ -102,7 +102,7 @@ services:
     image: guacamole/guacd
     networks:
       - guacnetwork_compose
-    restart: always
+    restart: unless-stopped
     volumes:
     - ./drive:/drive:rw
     - ./record:/record:rw
@@ -117,7 +117,7 @@ services:
     image: postgres:15.2-alpine
     networks:
       - guacnetwork_compose
-    restart: always
+    restart: unless-stopped
     volumes:
     - ./init:/docker-entrypoint-initdb.d:z
     - ./data:/var/lib/postgresql/data:Z
@@ -144,13 +144,13 @@ services:
     - 8181:8080/tcp # Guacamole is on :8080/guacamole, not /.
 ## enable next line when using nginx
 #    - 8080/tcp
-    restart: always
+    restart: unless-stopped
 
 ########### optional ##############
   # nginx
 #  nginx:
 #   container_name: nginx_guacamole_compose
-#   restart: always
+#   restart: unless-stopped
 #   image: nginx:latest
 #   volumes:
 #   - ./nginx/templates:/etc/nginx/templates:ro
diff --git a/immich-app/docker-compose.yml b/immich-app/docker-compose.yml
index 393e796..43edaf4 100644
--- a/immich-app/docker-compose.yml
+++ b/immich-app/docker-compose.yml
@@ -14,7 +14,7 @@ services:
     depends_on:
       - redis
       - database
-    restart: always
+    restart: unless-stopped
 
   immich-machine-learning:
     container_name: immich_machine_learning
@@ -23,14 +23,14 @@ services:
       - ./model-cache:/cache
     env_file:
       - .env
-    restart: always
+    restart: unless-stopped
 
   redis:
     container_name: immich_redis
     image: docker.io/valkey/valkey:8-bookworm@sha256:42cba146593a5ea9a622002c1b7cba5da7be248650cbb64ecb9c6c33d29794b1
     healthcheck:
       test: redis-cli ping || exit 1
-    restart: always
+    restart: unless-stopped
 
   database:
     container_name: immich_postgres
@@ -43,4 +43,4 @@ services:
       POSTGRES_DB: ${DB_DATABASE_NAME}
     volumes:
       - ./pgdata:/var/lib/postgresql/data
-    restart: always
+    restart: unless-stopped
diff --git a/monitoring/docker-compose.yml b/monitoring/docker-compose.yml
index fff27f6..7f06571 100644
--- a/monitoring/docker-compose.yml
+++ b/monitoring/docker-compose.yml
@@ -44,7 +44,7 @@ services:
     #image: nicolargo/glances:3.4.0.5-full
     image: nicolargo/glances:latest-full
     container_name: glances
-    restart: always
+    restart: unless-stopped
     pid: host
     ports:
       - 61208:61208
@@ -64,7 +64,7 @@ services:
       - ./uptime-kuma/uptime-kuma-data:/app/data
     ports:
       - 3001:3001  # <Host Port>:<Container Port>
-    restart: always
+    restart: unless-stopped
     environment:
       - TZ="America/Sao_Paulo"
 
@@ -203,5 +203,7 @@ networks:
     external: true
     name: caddy-net
   monitoring:
+    name: monitoring-net
   grafana:
+    name: grafana-net
   
\ No newline at end of file
diff --git a/monitoring/homepage/config/docker.yaml b/monitoring/homepage/config/docker.yaml
index ad6c8ae..5ee2c58 100644
--- a/monitoring/homepage/config/docker.yaml
+++ b/monitoring/homepage/config/docker.yaml
@@ -2,17 +2,14 @@
 # For configuration options and examples, please see:
 # https://gethomepage.dev/latest/configs/docker/
 
-arr-docker:
-  host: 192.168.1.201
-  port: 2375
+#arr-docker:
+#  host: 192.168.1.201
+#  port: 2375
   
-services-docker:
-  host: 192.168.1.202
-  port: 2375
+#services-docker:
+#  host: 192.168.1.202
+#  port: 2375
 
-morganna-docker:
-  host: 192.168.1.204
-  port: 2375
-
-pi-docker:
-  socket: /var/run/docker.sock
+#morganna-docker:
+#  host: 192.168.1.204
+#  port: 2375