5 files changed, 33 insertions, 30 deletions
diff --git a/stacks/tss/.env.template b/stacks/tss/.env.template
deleted file mode 100644
index b607b6b..0000000
--- a/stacks/tss/.env.template
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-#
-# Stack Compose Variables
-
-# Namespaces
-_STACK_0=
-
-# Containers
-_CONTAINER_0=
-
-# Networks
-_NET_0=
-
-# Volumes
-_VOLUME_0=
diff --git a/stacks/tss/.run.env.template b/stacks/tss/.run.env.template
deleted file mode 100644
index 103c5da..0000000
--- a/stacks/tss/.run.env.template
+++ /dev/null
@@ -1,5 +0,0 @@
-# TSS CONFIG
-RUST_LOG=info
-DATA_DIR=/var/lib/taskchampion-sync-server/data
-LISTEN=0.0.0.0:8080
-CLIENT_ID=
diff --git a/stacks/tss/compose.yml b/stacks/tss/compose.yml
index 63913f0..cbaf2f0 100644
--- a/stacks/tss/compose.yml
+++ b/stacks/tss/compose.yml
@@ -1,26 +1,26 @@
-name: ${_STACK_0}
+name: ${STACK}
 
 networks:
   edge-net:
-    name: ${_NET_0}
+    name: ${EDGE_NET}
     external: true
-
-volumes:
-  tss-db:
-    name: ${_VOLUME_0}
+  db-net:
+    name: ${DB_NET}
     external: true
 
 services:
   tss:
-    container_name: ${_CONTAINER_0}
-    image: ghcr.io/gothenburgbitfactory/taskchampion-sync-server:latest
+    container_name: ${TSS_CONTAINER}
+    image: ghcr.io/gothenburgbitfactory/taskchampion-sync-server-postgres:latest
     restart: unless-stopped
+    environment:
+      RUST_LOG: info
+      LISTEN: 0.0.0.0:8080
     env_file:
       - .run.env
       - .env
-    volumes:
-      - tss-db:/var/lib/taskchampion-sync-server/data
     networks:
       - edge-net
+      - db-net
     expose:
       - 8080
diff --git a/stacks/tss/env.template b/stacks/tss/env.template
new file mode 100644
index 0000000..57ab20a
--- /dev/null
+++ b/stacks/tss/env.template
@@ -0,0 +1,12 @@
+#
+#
+# Stack Compose Variables
+
+# Namespace
+STACK=
+
+# Container
+
+# Network
+EDGE_NET=
+DB_NET=
diff --git a/stacks/tss/run.env.template b/stacks/tss/run.env.template
new file mode 100644
index 0000000..09f266a
--- /dev/null
+++ b/stacks/tss/run.env.template
@@ -0,0 +1,11 @@
+#
+#
+# Stack Runtime Variables
+
+CLIENT_ID=
+DB_HOST=
+DB_PORT
+DB_USER=
+DB_PASSWORD=
+DB_BASE=
+CONNECTION=postgresql://$DB_USER:$DB_PASSWORD@$DB_HOST:$DB_PORT/$DB_BASE