diff --git a/Makefile b/Makefile
index 1a389ba..dccec42 100644
--- a/Makefile
+++ b/Makefile
@@ -182,6 +182,7 @@ uninstall:
 	    echo "Stopping containers and removing images..."; \
 	    for f in data/api/services/*/docker-compose.yml; do [ -f "$$f" ] && PUID=$$(id -u) PGID=$$(id -g) docker compose -f "$$f" down 2>/dev/null || true; done; \
 	    PUID=$$(id -u) PGID=$$(id -g) $(DCF) --profile core down --rmi all 2>/dev/null || true; \
+	    docker ps -aq --filter "name=cell-" | xargs -r docker rm -f 2>/dev/null || true; \
 	    docker network rm cell-network 2>/dev/null || true; \
 	    echo "Deleting config/ and data/..."; \
 	    sudo rm -rf config/ data/; \
@@ -191,14 +192,18 @@ uninstall:
 	    echo "Stopping and removing containers (keeping images and data)..."; \
 	    for f in data/api/services/*/docker-compose.yml; do [ -f "$$f" ] && PUID=$$(id -u) PGID=$$(id -g) docker compose -f "$$f" down 2>/dev/null || true; done; \
 	    PUID=$$(id -u) PGID=$$(id -g) $(DCF) --profile core down 2>/dev/null || true; \
+	    docker ps -aq --filter "name=cell-" | xargs -r docker rm -f 2>/dev/null || true; \
 	    echo "Done. Images, config/ and data/ are untouched. Run 'make start' to bring it back up."; \
 	    ;; \
 	  *) \
 	    echo "Cancelled."; \
 	    ;; \
 	esac
-	@-sudo systemctl disable pic 2>/dev/null || true
-	@-sudo rm -f /etc/systemd/system/pic.service
+	@if command -v systemctl >/dev/null 2>&1; then \
+	  sudo systemctl disable --now pic 2>/dev/null || true; \
+	  sudo rm -f /etc/systemd/system/pic.service; \
+	  sudo systemctl daemon-reload 2>/dev/null || true; \
+	fi
 	@-sudo rm -f /opt/pic/.installed
 	@echo "Note: Data volumes were not deleted. To remove all data, manually delete config/ and data/."
 
diff --git a/install.sh b/install.sh
index b95515f..78039ce 100755
--- a/install.sh
+++ b/install.sh
@@ -157,6 +157,17 @@ case "$PKG_MANAGER" in
             log_warn "docker-compose-plugin not available; falling back to standalone docker-compose"
             sudo apt-get install -y -qq docker-compose 2>&1 | grep -v "^$" | sed 's/^/  /' || true
         fi
+
+        # Ensure host clock is synchronised before DDNS/TOTP registration.
+        # chrony is preferred; the service name differs by distro (chrony on Debian, chronyd on some Ubuntu).
+        sudo apt-get install -y -qq chrony 2>&1 | grep -v "^$" | sed 's/^/  /' || true
+        if sudo systemctl enable --now chrony >/dev/null 2>&1; then
+            log_ok "Host NTP (chrony) enabled and started"
+        elif sudo systemctl enable --now chronyd >/dev/null 2>&1; then
+            log_ok "Host NTP (chronyd) enabled and started"
+        else
+            log_warn "Could not start chrony — verify host clock is accurate before running the setup wizard"
+        fi
         ;;
 
     dnf)
@@ -168,6 +179,11 @@ case "$PKG_MANAGER" in
             log_warn "docker compose plugin not found; installing docker-compose-plugin..."
             sudo dnf install -y -q docker-compose-plugin 2>&1 | sed 's/^/  /' || true
         fi
+
+        sudo dnf install -y -q chrony 2>&1 | sed 's/^/  /' || true
+        sudo systemctl enable --now chronyd >/dev/null 2>&1 \
+            && log_ok "Host NTP (chronyd) enabled and started" \
+            || log_warn "Could not start chronyd — verify host clock is accurate before running the setup wizard"
         ;;
 
     apk)
@@ -175,6 +191,12 @@ case "$PKG_MANAGER" in
 
         sudo rc-update add docker default >/dev/null 2>&1 || true
         sudo service docker start >/dev/null 2>&1 || true
+
+        sudo apk add --quiet chrony 2>&1 | sed 's/^/  /' || true
+        sudo rc-update add chronyd default >/dev/null 2>&1 || true
+        sudo service chronyd start >/dev/null 2>&1 \
+            && log_ok "Host NTP (chronyd) enabled and started" \
+            || log_warn "Could not start chronyd — verify host clock is accurate before running the setup wizard"
         ;;
 
 esac
@@ -269,6 +291,17 @@ fi
 
 log_ok "Core services started"
 
+# Enable and start the pic systemd unit so the stack survives a reboot.
+# Skipped on Alpine (OpenRC) and on systems without systemd.
+if command -v systemctl >/dev/null 2>&1; then
+    sudo systemctl daemon-reload 2>/dev/null || true
+    if sudo systemctl enable --now pic 2>/dev/null; then
+        log_ok "systemd unit pic.service enabled and started"
+    else
+        log_warn "Could not enable pic.service — run: sudo systemctl enable --now pic"
+    fi
+fi
+
 # ---------------------------------------------------------------------------
 # Step 7 — Health check + print wizard URL
 # ---------------------------------------------------------------------------