diff --git a/gitops_router.sh b/gitops_router.sh
index 1a1c53d..3ce430c 100644
--- a/gitops_router.sh
+++ b/gitops_router.sh
@@ -149,9 +149,9 @@ validate_command "$PERSON" "$cmd" "${args[@]}"
 case "$cmd" in
 build)
   case "${args[0]}" in
-  base) podman build --target base -t analytics-backend-base . ;;
-  workspace) podman build --target workspace -t analytics-backend-workspace . ;;
-  all) podman build -t analytics-backend-workspace . ;;
+  base) podman build --target base -t workspaces-base . ;;
+  workspace) podman build --target workspace -t workspaces . ;;
+  all) podman build -t workspaces . ;;
   *) log ERROR "build: invalid arg '${args[0]}'" ;;
   esac
   ;;
diff --git a/ssh_router.sh b/ssh_router.sh
index 340f0ef..a1d58ac 100644
--- a/ssh_router.sh
+++ b/ssh_router.sh
@@ -3,7 +3,7 @@ set -euo pipefail
 
 PERSON="${1:?Usage: $0 <person>}"
 WORKSPACE="${SSH_ORIGINAL_COMMAND:-}"
-IMAGE="localhost/analytics-backend-workspace:latest"
+IMAGE="localhost/workspaces:latest"
 DEV_USER="devuser"
 XDG_RUNTIME_DIR="/run/user/$(id -u)"
 LOG_FILE="/tmp/.ssh-router-${PERSON}.log"
@@ -45,7 +45,7 @@ if [[ -z "$WORKSPACE" ]]; then
   WORKSPACE="$PERSON"
   log INFO "Defaulted WORKSPACE → $WORKSPACE"
 fi
-TMUX_SESSION="${WORKSPACE}|analytics-backend"
+TMUX_SESSION="${WORKSPACE}|workspace"
 
 # ─────────────────────────────────────────────
 # Ensure Podman socket is up