diff --git a/public/svgs/one-time-secret.svg b/public/svgs/onetimesecret.svg
similarity index 100%
rename from public/svgs/one-time-secret.svg
rename to public/svgs/onetimesecret.svg
diff --git a/templates/compose/one-time-secret.yaml b/templates/compose/onetimesecret.yaml
similarity index 59%
rename from templates/compose/one-time-secret.yaml
rename to templates/compose/onetimesecret.yaml
index 9a861bc50..6021253a8 100644
--- a/templates/compose/one-time-secret.yaml
+++ b/templates/compose/onetimesecret.yaml
@@ -1,37 +1,25 @@
 # documentation: https://docs.onetimesecret.com
 # slogan: Share sensitive information securely with self-destructing links that are only viewable once.
 # tags: auth,password,secret,secure
-# logo: svgs/one-time-secret.svg
+# logo: svgs/onetimesecret.svg
 # port: 3000
 
 services:
-  onetimesecret-redis:
-    image: "redis:alpine"
-    restart: unless-stopped
-    command: redis-server --requirepass ${SERVICE_PASSWORD_REDIS}
-    healthcheck:
-      test:
-        - CMD
-        - redis-cli
-        - ping
-      interval: 30s
-      timeout: 10s
-      retries: 3
   onetimesecret:
-    image: "onetimesecret/onetimesecret:latest"
-    restart: unless-stopped
+    image: onetimesecret/onetimesecret:latest
     environment:
-      - "AUTH_AUTOVERIFY=${AUTH_AUTOVERIFY-true}"
-      - "AUTH_SIGNUP=${AUTH_SIGNUP-true}"
-      - "COLONEL=${COLONEL-admin@example.com}"
-      - "HOST=${HOST}"
-      - "REDIS_URL=redis://:${SERVICE_PASSWORD_REDIS}@onetimesecret-redis:6379/0"
-      - "SECRET=${SERVICE_PASSWORD_ONETIMESECRET}"
-      - "SSL=${SSL-true}"
-      - RACK_ENV=production
       - SERVICE_FQDN_ONETIMESECRET_3000
+      - AUTH_AUTOVERIFY=${AUTH_AUTOVERIFY:-true}
+      - AUTH_SIGNUP=${AUTH_SIGNUP:-true}
+      - COLONEL=${COLONEL:-admin@example.com}
+      - HOST=${HOST:-localhost}
+      - REDIS_URL=redis://:${SERVICE_PASSWORD_REDIS}@redis:6379/0
+      - SECRET=${SERVICE_PASSWORD_ONETIMESECRET}
+      - SSL=${SSL:-false}
+      - RACK_ENV=production
     depends_on:
-      - onetimesecret-redis
+      redis:
+        condition: service_healthy
     healthcheck:
       test:
         - CMD
@@ -42,3 +30,15 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
+
+  redis:
+    image: redis:8-alpine
+    command: redis-server --requirepass ${SERVICE_PASSWORD_REDIS}
+    healthcheck:
+      test:
+        - CMD
+        - redis-cli
+        - ping
+      interval: 30s
+      timeout: 10s
+      retries: 3