diff --git a/HPNas/Networking/docker-compose.yml b/HPNas/Networking/docker-compose.yml
index f272d3b..72fcd48 100644
--- a/HPNas/Networking/docker-compose.yml
+++ b/HPNas/Networking/docker-compose.yml
@@ -16,4 +16,4 @@ services:
     environment:
       - NGINX_HOST=192.168.0.67
       - NGINX_PORT=80
-    restart: always
+    restart: unless-stopped
diff --git a/PiDesk/Networking/docker-compose.yml b/PiDesk/Networking/docker-compose.yml
index b78464c..3e662f3 100644
--- a/PiDesk/Networking/docker-compose.yml
+++ b/PiDesk/Networking/docker-compose.yml
@@ -16,3 +16,4 @@ services:
     environment:
       - NGINX_HOST=192.168.0.93
       - NGINX_PORT=80
+    restart: unless-stopped
diff --git a/PiHome/IOT/docker-compose.yml b/PiHome/IOT/docker-compose.yml
index 330d63c..2541cab 100644
--- a/PiHome/IOT/docker-compose.yml
+++ b/PiHome/IOT/docker-compose.yml
@@ -13,17 +13,19 @@ services:
       - mosquitto_data:/mosquitto/data
       - mosquitto_config:/mosquitto/config
       - mosquitto_log:/mosquitto/log
-
-  homeassistant:
-    container_name: homeassistant
-    image: "ghcr.io/home-assistant/home-assistant:stable"
-    volumes:
-      - /home/pi/config/homeassistant:/config
-      - /etc/localtime:/etc/localtime:ro
-      - /run/dbus:/run/dbus:ro
     restart: unless-stopped
-    privileged: true
-    network_mode: host
+
+# Commented out due to resource constraints and it not being the correct setup
+#  homeassistant:
+#    container_name: homeassistant
+#    image: "ghcr.io/home-assistant/home-assistant:stable"
+#    volumes:
+#      - /home/pi/config/homeassistant:/config
+#      - /etc/localtime:/etc/localtime:ro
+#      - /run/dbus:/run/dbus:ro
+#    restart: unless-stopped
+#    privileged: true
+#    network_mode: host
 
   node-red:
     container_name: Node-Red
@@ -85,6 +87,19 @@ services:
     privileged: true # Required for GPIO Access
     restart: unless-stopped
 
+  spoolman:
+    container_name: spoolman
+    image: ghcr.io/donkie/spoolman:latest
+    restart: unless-stopped
+    volumes:
+      # Mount the host machine's ./data directory into the container's /home/app/.local/share/spoolman directory
+      - type: bind
+        source: /home/pi/docker-mounts/spoolman # This is where the data will be stored locally. Could also be set to for example `source: /home/pi/printer_data/spoolman`.
+        target: /home/app/.local/share/spoolman # Do NOT modify this line
+    ports:
+      # Map the host machine's port 7912 to the container's port 8000
+      - "7912:8000"
+  
 volumes:
   mosquitto_data:
   mosquitto_config:
diff --git a/PiHome/Misc/.env b/PiHome/Misc/.env
deleted file mode 100644
index 4ad4ee2..0000000
--- a/PiHome/Misc/.env
+++ /dev/null
@@ -1 +0,0 @@
-COMPOSE_PROJECT_NAME=misc
diff --git a/PiHome/Misc/docker-compose.yml b/PiHome/Misc/docker-compose.yml
deleted file mode 100644
index 3a08e32..0000000
--- a/PiHome/Misc/docker-compose.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: "3"
-
-services:
-  heimdall:
-    image: lscr.io/linuxserver/heimdall:latest
-    container_name: heimdall
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Etc/UTC
-    volumes:
-      - /path/to/appdata/config:/config
-    ports:
-      - 80:80
-      - 443:443
-    restart: unless-stopped
\ No newline at end of file
diff --git a/PiHome/Networking/docker-compose.yml b/PiHome/Networking/docker-compose.yml
index 6ec9f71..c474176 100644
--- a/PiHome/Networking/docker-compose.yml
+++ b/PiHome/Networking/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - "1080:80/tcp"
     environment:
       TZ: 'Europe/London'
-      WEBPASSWORD: 'set a secure password here or it will be random'
+      WEBPASSWORD: 'Admin'
     # Volumes store your data between container upgrades
     volumes:
       - type: bind
@@ -42,5 +42,6 @@ services:
     ports:
       - "80:80"
     environment:
-      - NGINX_HOST=192.168.0.43
+      - NGINX_HOST=192.168.0.68
       - NGINX_PORT=80
+    restart: unless-stopped
diff --git a/PiHome/docker-compose.sh b/PiHome/docker-compose.sh
index 506e7fd..86c6f20 100644
--- a/PiHome/docker-compose.sh
+++ b/PiHome/docker-compose.sh
@@ -6,7 +6,7 @@ directories=(
     "./Security/"
     "./Networking/"
     "./IOT/"
-    "./Finances/"
+    # "./Finances/"
     
 )
 
diff --git a/PiLab/Networking/docker-compose.yml b/PiLab/Networking/docker-compose.yml
index 4785732..823e863 100644
--- a/PiLab/Networking/docker-compose.yml
+++ b/PiLab/Networking/docker-compose.yml
@@ -16,3 +16,4 @@ services:
     environment:
       - NGINX_HOST=192.168.0.69
       - NGINX_PORT=80
+    restart: unless-stopped
diff --git a/PiWeb/Networking/docker-compose.yml b/PiWeb/Networking/docker-compose.yml
index 7606858..2e1c6bb 100644
--- a/PiWeb/Networking/docker-compose.yml
+++ b/PiWeb/Networking/docker-compose.yml
@@ -16,3 +16,4 @@ services:
     environment:
       - NGINX_HOST=192.168.0.70
       - NGINX_PORT=80
+    restart: unless-stopped
diff --git a/PrusaPrint/Networking/docker-compose.yml b/PrusaPrint/Networking/docker-compose.yml
index c7e7527..3ca7d8a 100644
--- a/PrusaPrint/Networking/docker-compose.yml
+++ b/PrusaPrint/Networking/docker-compose.yml
@@ -16,3 +16,5 @@ services:
     environment:
       - NGINX_HOST=192.168.0.43
       - NGINX_PORT=80
+    restart: unless-stopped
+