diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml
index ef0d302..02783e7 100644
--- a/demo/docker-compose.yml
+++ b/demo/docker-compose.yml
@@ -298,7 +298,7 @@ services:
       homepage.description: "Habit tracking and personal dashboard"
     healthcheck:
       test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider",
-             "http://localhost:3000"]
+             "http://localhost:8080"]
       interval: 30s
       timeout: 10s
       retries: 3
@@ -346,6 +346,7 @@ services:
       - TA_HOST=tubearchivist
       - TA_PORT=4014
       - TA_DEBUG=false
+      - TA_USERNAME=demo
       - PUID=1000
       - PGID=1000
     labels:
@@ -354,12 +355,6 @@ services:
       homepage.icon: "tube-archivist"
       homepage.href: "http://localhost:4014"
       homepage.description: "YouTube video archiving"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "--silent",
-             "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
 
   # Wakapi - Time Tracking
   wakapi:
@@ -421,6 +416,7 @@ services:
     image: ghcr.io/atuinsh/atuin:v18.10.0
     container_name: "tsysdevstack-supportstack-demo-atuin"
     restart: unless-stopped
+    command: server start
     networks:
       - tsysdevstack-supportstack-demo-network
     ports:
@@ -428,6 +424,7 @@ services:
     volumes:
       - tsysdevstack-supportstack-demo_atuin_data:/config
     environment:
+      - ATUIN_DB_URI=sqlite:///config/atuin.db
       - PUID=1000
       - PGID=1000
     labels:
@@ -436,9 +433,3 @@ services:
       homepage.icon: "atuin"
       homepage.href: "http://localhost:4018"
       homepage.description: "Magical shell history synchronization"
-    healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider",
-             "http://localhost:8888"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
diff --git a/demo/docker-compose.yml.template b/demo/docker-compose.yml.template
index b7d1c8f..07865c9 100644
--- a/demo/docker-compose.yml.template
+++ b/demo/docker-compose.yml.template
@@ -298,7 +298,7 @@ services:
       homepage.description: "Habit tracking and personal dashboard"
     healthcheck:
       test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider",
-             "http://localhost:3000"]
+             "http://localhost:8080"]
       interval: ${HEALTH_CHECK_INTERVAL}
       timeout: ${HEALTH_CHECK_TIMEOUT}
       retries: ${HEALTH_CHECK_RETRIES}
@@ -346,6 +346,7 @@ services:
       - TA_HOST=${TA_HOST}
       - TA_PORT=${TA_PORT}
       - TA_DEBUG=${TA_DEBUG}
+      - TA_USERNAME=demo
       - PUID=${DEMO_UID}
       - PGID=${DEMO_GID}
     labels:
@@ -354,12 +355,6 @@ services:
       homepage.icon: "tube-archivist"
       homepage.href: "http://localhost:${TUBE_ARCHIVIST_PORT}"
       homepage.description: "YouTube video archiving"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "--silent",
-             "http://localhost:8000"]
-      interval: ${HEALTH_CHECK_INTERVAL}
-      timeout: ${HEALTH_CHECK_TIMEOUT}
-      retries: ${HEALTH_CHECK_RETRIES}
 
   # Wakapi - Time Tracking
   wakapi:
@@ -421,6 +416,7 @@ services:
     image: ghcr.io/atuinsh/atuin:v18.10.0
     container_name: "${COMPOSE_PROJECT_NAME}-atuin"
     restart: unless-stopped
+    command: server start
     networks:
       - ${COMPOSE_NETWORK_NAME}
     ports:
@@ -428,6 +424,7 @@ services:
     volumes:
       - ${COMPOSE_PROJECT_NAME}_atuin_data:/config
     environment:
+      - ATUIN_DB_URI=sqlite:///config/atuin.db
       - PUID=${DEMO_UID}
       - PGID=${DEMO_GID}
     labels:
diff --git a/demo/tmp_template.yml b/demo/tmp_template.yml
new file mode 100644
index 0000000..e69de29