diff --git a/apps/immich-postgres/manifest.yml b/apps/immich-postgres/manifest.yml
index 6ba96b2a..88f42506 100644
--- a/apps/immich-postgres/manifest.yml
+++ b/apps/immich-postgres/manifest.yml
@@ -4,10 +4,11 @@ app:
   version: "14-vectorchord0.4.3-pgvectors0.2.0"
   description: Postgres (pgvecto.rs / vectorchord) backend for Immich.
 
-  # No container_name override: the container is named by app_id (immich-postgres),
-  # which is also its archy-net alias and the server's DB_HOSTNAME. (Overriding the
-  # name diverges from the orchestrator's app_id-based naming and spawns duplicate
-  # containers — mirror the btcpay stack, which names members by app_id.)
+  # Container named immich_postgres (underscore) to match the runtime's existing
+  # per-app references (lifecycle/health/crash-recovery/config) and serve as the
+  # server's DB_HOSTNAME alias. Top-level key → serde(flatten) → extensions →
+  # compute_container_name.
+  container_name: immich_postgres
 
   container:
     image: 146.59.87.168:3000/lfg2025/immich-postgres:14-vectorchord0.4.3-pgvectors0.2.0
diff --git a/apps/immich-redis/manifest.yml b/apps/immich-redis/manifest.yml
index fabb69db..2450a615 100644
--- a/apps/immich-redis/manifest.yml
+++ b/apps/immich-redis/manifest.yml
@@ -4,7 +4,9 @@ app:
   version: "7-alpine"
   description: Valkey (Redis-compatible) cache for Immich.
 
-  # Named by app_id (immich-redis) = archy-net alias = server's REDIS_HOSTNAME.
+  # Container named immich_redis (underscore) to match runtime per-app references
+  # and serve as the server's REDIS_HOSTNAME alias on archy-net.
+  container_name: immich_redis
 
   container:
     image: 146.59.87.168:3000/lfg2025/valkey:7-alpine
diff --git a/apps/immich/manifest.yml b/apps/immich/manifest.yml
index b2ca3c98..e29c7c01 100644
--- a/apps/immich/manifest.yml
+++ b/apps/immich/manifest.yml
@@ -5,8 +5,12 @@ app:
   description: Self-hosted photo and video backup with mobile apps and search.
 
   # app_id "immich" = the user-facing launcher (matches the catalog entry's title
-  # + icon). Container is named "immich"; it reaches its backends by their app_id
-  # aliases on archy-net (see DB_HOSTNAME / REDIS_HOSTNAME below).
+  # + icon). The container is named "immich_server" so it matches the runtime's
+  # existing per-app container references (lifecycle/health/crash-recovery/ports);
+  # `container_name` is a top-level app key (captured by serde(flatten) into
+  # extensions, read by compute_container_name). It reaches its backends by their
+  # underscore aliases on archy-net (DB_HOSTNAME / REDIS_HOSTNAME below).
+  container_name: immich_server
 
   container:
     image: 146.59.87.168:3000/lfg2025/immich-server:release
@@ -42,10 +46,10 @@ app:
       options: [rw]
 
   environment:
-    - DB_HOSTNAME=immich-postgres
+    - DB_HOSTNAME=immich_postgres
     - DB_USERNAME=postgres
     - DB_DATABASE_NAME=immich
-    - REDIS_HOSTNAME=immich-redis
+    - REDIS_HOSTNAME=immich_redis
     - UPLOAD_LOCATION=/usr/src/app/upload
 
   health_check: