diff --git a/.gitignore b/.gitignore
index ee756ac0..91f7612d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,4 +49,4 @@ docker/Dockerfile.redis
 docker/Dockerfile.viewer
 docker/Dockerfile.wifi-connect
 docker/Dockerfile.test
-
+docker-compose.yml
\ No newline at end of file
diff --git a/bin/upgrade_containers.sh b/bin/upgrade_containers.sh
index 2e130bb2..ae999213 100755
--- a/bin/upgrade_containers.sh
+++ b/bin/upgrade_containers.sh
@@ -23,12 +23,14 @@ else
     export DEVICE_TYPE="pi1"
 fi
 
+cat /home/${USER}/screenly/docker-compose.yml.tmpl \
+    | envsubst \
+    > /home/${USER}/screenly/docker-compose.yml
+
 sudo -E docker compose \
     -f /home/${USER}/screenly/docker-compose.yml \
-    -f /home/${USER}/screenly/docker-compose.override.yml \
     pull
 
 sudo -E docker compose \
     -f /home/${USER}/screenly/docker-compose.yml \
-    -f /home/${USER}/screenly/docker-compose.override.yml \
     up -d
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
deleted file mode 100644
index 182885a9..00000000
--- a/docker-compose.override.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-version: "2"
-services:
-  srly-ose-wifi-connect:
-    image: screenly/srly-ose-wifi-connect:${DOCKER_TAG}-${DEVICE_TYPE}
-
-  srly-ose-server:
-    image: screenly/srly-ose-server:${DOCKER_TAG}-${DEVICE_TYPE}
-    environment:
-      - MY_IP=${MY_IP}
-    volumes:
-      - /home/${USER}/.screenly:/data/.screenly
-      - /home/${USER}/screenly_assets:/data/screenly_assets
-      - /home/${USER}/screenly/static:/data/screenly/static
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-
-  srly-ose-viewer:
-    image: screenly/srly-ose-viewer:${DOCKER_TAG}-${DEVICE_TYPE}
-    mem_limit: ${VIEWER_MEMORY_LIMIT_KB}k
-    volumes:
-      - /home/${USER}/.screenly:/data/.screenly
-      - /home/${USER}/screenly_assets:/data/screenly_assets
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-
-  srly-ose-websocket:
-    image: screenly/srly-ose-websocket:${DOCKER_TAG}-${DEVICE_TYPE}
-    volumes:
-      - /home/${USER}/.screenly:/data/.screenly
-      - /home/${USER}/screenly_assets:/data/screenly_assets
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-
-  srly-ose-celery:
-    image: screenly/srly-ose-celery:${DOCKER_TAG}-${DEVICE_TYPE}
-    volumes:
-      - /home/${USER}/.screenly:/data/.screenly
-      - /home/${USER}/screenly_assets:/data/screenly_assets
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-
-  redis:
-    image: screenly/srly-ose-redis:${DOCKER_TAG}-${DEVICE_TYPE}
-
-  srly-ose-nginx:
-    image: screenly/srly-ose-nginx:${DOCKER_TAG}-${DEVICE_TYPE}
-    volumes:
-      - /home/${USER}/.screenly:/data/.screenly:ro
-      - /home/${USER}/screenly_assets:/data/screenly_assets:ro
-      - /home/${USER}/screenly/static:/data/screenly/static:ro
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-
-volumes:
-  screenly-data:
diff --git a/docker-compose.yml b/docker-compose.yml.tmpl
similarity index 58%
rename from docker-compose.yml
rename to docker-compose.yml.tmpl
index 9b65eb7e..f17ddfbe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml.tmpl
@@ -1,7 +1,9 @@
+# vim: ft=yaml
+
 version: "2"
 services:
   srly-ose-wifi-connect:
-    image: screenly/srly-ose-wifi-connect
+    image: screenly/anthias-wifi-connect:${DOCKER_TAG}-${DEVICE_TYPE}
     build:
       args:
         TARGET_PLATFORM: ${TARGET_PLATFORM:-linux/arm/v7}
@@ -21,11 +23,13 @@ services:
         target: /run/dbus/system_bus_socket
 
   srly-ose-server:
-    image: screenly/srly-ose-server
+    image: screenly/anthias-server:${DOCKER_TAG}-${DEVICE_TYPE}
     build:
       context: .
       dockerfile: docker/Dockerfile.server
+    volumes:
     environment:
+      - MY_IP=${MY_IP}
       - HOME=/data
       - LISTEN=0.0.0.0
       - CELERY_BROKER_URL=redis://redis:6379/0
@@ -35,14 +39,20 @@ services:
     restart: always
     volumes:
       - resin-data:/data
+      - /home/${USER}/.screenly:/data/.screenly
+      - /home/${USER}/screenly_assets:/data/screenly_assets
+      - /home/${USER}/screenly/static:/data/screenly/static
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
     labels:
       io.balena.features.supervisor-api: '1'
 
   srly-ose-viewer:
-    image: screenly/srly-ose-viewer
+    image: screenly/anthias-viewer:${DOCKER_TAG}-${DEVICE_TYPE}
     build:
       context: .
       dockerfile: docker/Dockerfile.viewer
+    mem_limit: ${VIEWER_MEMORY_LIMIT_KB}k
     depends_on:
       - srly-ose-server
     environment:
@@ -56,11 +66,15 @@ services:
     restart: always
     volumes:
       - resin-data:/data
+      - /home/${USER}/.screenly:/data/.screenly
+      - /home/${USER}/screenly_assets:/data/screenly_assets
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
     labels:
       io.balena.features.supervisor-api: '1'
 
   srly-ose-websocket:
-    image: screenly/srly-ose-websocket
+    image: screenly/anthias-websocket:${DOCKER_TAG}-${DEVICE_TYPE}
     build:
       context: .
       dockerfile: docker/Dockerfile.websocket
@@ -72,9 +86,13 @@ services:
     restart: always
     volumes:
       - resin-data:/data
+      - /home/${USER}/.screenly:/data/.screenly
+      - /home/${USER}/screenly_assets:/data/screenly_assets
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
 
   srly-ose-celery:
-    image: screenly/srly-ose-celery
+    image: screenly/anthias-celery:${DOCKER_TAG}-${DEVICE_TYPE}
     build:
       context: .
       dockerfile: docker/Dockerfile.celery
@@ -90,11 +108,15 @@ services:
     restart: always
     volumes:
       - resin-data:/data
+      - /home/${USER}/.screenly:/data/.screenly
+      - /home/${USER}/screenly_assets:/data/screenly_assets
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
     labels:
       io.balena.features.supervisor-api: '1'
 
   redis:
-    image: screenly/srly-ose-redis
+    image: screenly/anthias-redis:${DOCKER_TAG}-${DEVICE_TYPE}
     build:
       context: .
       dockerfile: docker/Dockerfile.redis
@@ -105,7 +127,7 @@ services:
       - redis-data:/var/lib/redis
 
   srly-ose-nginx:
-    image: screenly/srly-ose-nginx
+    image: screenly/anthias-nginx:${DOCKER_TAG}-${DEVICE_TYPE}
     build:
       context: .
       dockerfile: docker/Dockerfile.nginx
@@ -119,7 +141,37 @@ services:
     restart: always
     volumes:
       - resin-data:/data:ro
+      - /home/${USER}/.screenly:/data/.screenly:ro
+      - /home/${USER}/screenly_assets:/data/screenly_assets:ro
+      - /home/${USER}/screenly/static:/data/screenly/static:ro
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
 
 volumes:
   resin-data:
   redis-data:
+  screenly-data:
+
+---
+
+
+  version: "2"
+services:
+
+  srly-ose-server:
+
+  srly-ose-viewer:
+    volumes:
+
+  srly-ose-websocket:
+    volumes:
+
+  srly-ose-celery:
+    volumes:
+
+  redis:
+
+  srly-ose-nginx:
+    volumes:
+
+volumes: