diff --git a/deployment/cli/nexus_push.py b/deployment/cli/nexus_push.py
index 5908f0c3b..8471f32e1 100644
--- a/deployment/cli/nexus_push.py
+++ b/deployment/cli/nexus_push.py
@@ -1,13 +1,43 @@
 """Push locally-built images to local Nexus registry for act CI runner."""
 
 import argparse
+import pathlib
 import re
 import subprocess
+import yaml
+
 from cli.helpers import (
     PROJECT_ROOT, GREEN, YELLOW, RED, NC,
-    docker_image_exists, log_info, run,
+    docker_image_exists, log_info, run as run_proc,
 )
 
+COMPOSE_FILE = pathlib.Path(__file__).parent.parent / "docker-compose.stack.yml"
+BASE_IMAGES_DIR = pathlib.Path(__file__).parent.parent / "base-images"
+
+# Dockerfile.apt -> base-apt, Dockerfile.node-deps -> base-node-deps, etc.
+_DOCKERFILE_RE = re.compile(r"^Dockerfile\.(.+)$")
+
+
+def _load_image_names() -> list[str]:
+    """Return all image short-names: base images from Dockerfiles + apps from compose."""
+    names = []
+
+    for df in sorted(BASE_IMAGES_DIR.glob("Dockerfile.*")):
+        m = _DOCKERFILE_RE.match(df.name)
+        if m:
+            names.append(f"base-{m.group(1)}")
+
+    with open(COMPOSE_FILE) as f:
+        dc = yaml.safe_load(f)
+    for svc_name, svc in dc.get("services", {}).items():
+        if "build" not in svc:
+            continue
+        local = svc.get("image", f"deployment-{svc_name}:latest")
+        name = local.split("/")[-1].split(":")[0].removeprefix("deployment-")
+        names.append(name)
+
+    return names
+
 
 def run_cmd(args: argparse.Namespace, config: dict) -> int:
     local_registry = "localhost:5050"
@@ -35,28 +65,26 @@ def run_cmd(args: argparse.Namespace, config: dict) -> int:
         )
         tag = result.stdout.strip() if result.returncode == 0 else "main"
 
+    images = _load_image_names()
+
     print(f"{YELLOW}Registry:{NC} {local_registry}")
     print(f"{YELLOW}Slug:{NC}     {slug}")
-    print(f"{YELLOW}Tag:{NC}      {tag}\n")
+    print(f"{YELLOW}Tag:{NC}      {tag}")
+    print(f"{YELLOW}Images:{NC}   {len(images)} (base-images/ + docker-compose.stack.yml)\n")
 
     log_info(f"Logging in to {local_registry}...")
-    run(["docker", "login", local_registry, "-u", nexus_user, "--password-stdin"],
-        input=nexus_pass.encode())
-
-    base_images = ["base-apt", "base-node-deps", "base-pip-deps", "base-conan-deps",
-                    "base-android-sdk", "devcontainer"]
-    app_images = ["pastebin", "workflowui", "codegen", "postgres-dashboard",
-                   "emailclient", "exploded-diagrams", "storybook"]
+    run_proc(["docker", "login", local_registry, "-u", nexus_user, "--password-stdin"],
+             input=nexus_pass.encode())
 
     pushed = skipped = failed = 0
-    for image in base_images + app_images:
+    for image in images:
         src = f"{source_registry}/{slug}/{image}:{tag}"
         dst = f"{local_registry}/{slug}/{image}:{tag}"
 
         if args.pull:
             print(f"  {YELLOW}pulling{NC} {src}...")
             if not docker_image_exists(src):
-                result = run(["docker", "pull", src])
+                result = run_proc(["docker", "pull", src])
                 if result.returncode != 0:
                     print(f"  {YELLOW}skip{NC} {image} (not found in {source_registry})")
                     skipped += 1
@@ -68,10 +96,10 @@ def run_cmd(args: argparse.Namespace, config: dict) -> int:
             continue
 
         if docker_image_exists(src):
-            run(["docker", "tag", src, dst])
+            run_proc(["docker", "tag", src, dst])
 
         print(f"  {GREEN}push{NC} {dst}")
-        result = run(["docker", "push", dst])
+        result = run_proc(["docker", "push", dst])
         if result.returncode == 0:
             pushed += 1
         else: