diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml
index afd0f41..ef0d302 100644
--- a/demo/docker-compose.yml
+++ b/demo/docker-compose.yml
@@ -17,8 +17,9 @@ volumes:
     driver: local
   tsysdevstack-supportstack-demo_pihole_data:
     driver: local
-  tsysdevstack-supportstack-demo_portainer_data:
+  tsysdevstack-supportstack-demo_dockhand_data:
     driver: local
+
   tsysdevstack-supportstack-demo_influxdb_data:
     driver: local
   tsysdevstack-supportstack-demo_grafana_data:
@@ -128,29 +129,30 @@ services:
       timeout: 10s
       retries: 3
 
-  # Portainer - Container Management
-  portainer:
-    image: portainer/portainer-ce:latest
-    container_name: "tsysdevstack-supportstack-demo-portainer"
+  # Dockhand - Docker Management
+  dockhand:
+    image: fnsys/dockhand:latest
+    container_name: "tsysdevstack-supportstack-demo-dockhand"
     restart: unless-stopped
     networks:
       - tsysdevstack-supportstack-demo-network
     ports:
-      - "4007:9000"
+      - "4007:3000"
     volumes:
-      - tsysdevstack-supportstack-demo_portainer_data:/data
+      - tsysdevstack-supportstack-demo_dockhand_data:/app/data
+      - /var/run/docker.sock:/var/run/docker.sock
     environment:
       - PUID=1000
       - PGID=1000
     labels:
       homepage.group: "Infrastructure"
-      homepage.name: "Portainer"
-      homepage.icon: "portainer"
+      homepage.name: "Dockhand"
+      homepage.icon: "dockhand"
       homepage.href: "http://localhost:4007"
-      homepage.description: "Web-based container management"
+      homepage.description: "Modern Docker management UI"
     healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider",
-             "http://localhost:9000"]
+      test: ["CMD", "curl", "-f", "--silent",
+             "http://localhost:3000"]
       interval: 30s
       timeout: 10s
       retries: 3
@@ -239,7 +241,7 @@ services:
       homepage.href: "http://localhost:4010"
       homepage.description: "Web-based diagramming application"
     healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider",
+      test: ["CMD", "curl", "-f", "--silent",
              "http://localhost:8080"]
       interval: 30s
       timeout: 10s
@@ -267,7 +269,7 @@ services:
       homepage.href: "http://localhost:4011"
       homepage.description: "Diagrams as a service"
     healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider",
+      test: ["CMD", "curl", "-f", "--silent",
              "http://localhost:8000/health"]
       interval: 30s
       timeout: 10s
@@ -281,7 +283,7 @@ services:
     networks:
       - tsysdevstack-supportstack-demo-network
     ports:
-      - "4012:3000"
+      - "4012:8080"
     volumes:
       - tsysdevstack-supportstack-demo_atomictracker_data:/app/data
     environment:
@@ -353,7 +355,7 @@ services:
       homepage.href: "http://localhost:4014"
       homepage.description: "YouTube video archiving"
     healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider",
+      test: ["CMD", "curl", "-f", "--silent",
              "http://localhost:8000"]
       interval: 30s
       timeout: 10s
@@ -426,9 +428,6 @@ services:
     volumes:
       - tsysdevstack-supportstack-demo_atuin_data:/config
     environment:
-      - ATUIN_HOST=atuin
-      - ATUIN_PORT=4018
-      - ATUIN_OPEN_REGISTRATION=true
       - PUID=1000
       - PGID=1000
     labels:
diff --git a/demo/docker-compose.yml.template b/demo/docker-compose.yml.template
index f81b0f8..b7d1c8f 100644
--- a/demo/docker-compose.yml.template
+++ b/demo/docker-compose.yml.template
@@ -151,7 +151,7 @@ services:
       homepage.href: "http://localhost:${DOCKHAND_PORT}"
       homepage.description: "Modern Docker management UI"
     healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider",
+      test: ["CMD", "curl", "-f", "--silent",
              "http://localhost:3000"]
       interval: ${HEALTH_CHECK_INTERVAL}
       timeout: ${HEALTH_CHECK_TIMEOUT}
@@ -241,7 +241,7 @@ services:
       homepage.href: "http://localhost:${DRAWIO_PORT}"
       homepage.description: "Web-based diagramming application"
     healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider",
+      test: ["CMD", "curl", "-f", "--silent",
              "http://localhost:8080"]
       interval: ${HEALTH_CHECK_INTERVAL}
       timeout: ${HEALTH_CHECK_TIMEOUT}
@@ -269,7 +269,7 @@ services:
       homepage.href: "http://localhost:${KROKI_PORT}"
       homepage.description: "Diagrams as a service"
     healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider",
+      test: ["CMD", "curl", "-f", "--silent",
              "http://localhost:8000/health"]
       interval: ${HEALTH_CHECK_INTERVAL}
       timeout: ${HEALTH_CHECK_TIMEOUT}
@@ -283,7 +283,7 @@ services:
     networks:
       - ${COMPOSE_NETWORK_NAME}
     ports:
-      - "${ATOMIC_TRACKER_PORT}:3000"
+      - "${ATOMIC_TRACKER_PORT}:8080"
     volumes:
       - ${COMPOSE_PROJECT_NAME}_atomictracker_data:/app/data
     environment:
@@ -355,7 +355,7 @@ services:
       homepage.href: "http://localhost:${TUBE_ARCHIVIST_PORT}"
       homepage.description: "YouTube video archiving"
     healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider",
+      test: ["CMD", "curl", "-f", "--silent",
              "http://localhost:8000"]
       interval: ${HEALTH_CHECK_INTERVAL}
       timeout: ${HEALTH_CHECK_TIMEOUT}
@@ -428,9 +428,6 @@ services:
     volumes:
       - ${COMPOSE_PROJECT_NAME}_atuin_data:/config
     environment:
-      - ATUIN_HOST=${ATUIN_HOST}
-      - ATUIN_PORT=${ATUIN_PORT}
-      - ATUIN_OPEN_REGISTRATION=${ATUIN_OPEN_REGISTRATION}
       - PUID=${DEMO_UID}
       - PGID=${DEMO_GID}
     labels:
@@ -439,9 +436,3 @@ services:
       homepage.icon: "atuin"
       homepage.href: "http://localhost:${ATUIN_PORT}"
       homepage.description: "Magical shell history synchronization"
-    healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider",
-             "http://localhost:8888"]
-      interval: ${HEALTH_CHECK_INTERVAL}
-      timeout: ${HEALTH_CHECK_TIMEOUT}
-      retries: ${HEALTH_CHECK_RETRIES}