diff --git a/brev/welcome-ui/SERVER_ARCHITECTURE.md b/brev/welcome-ui/SERVER_ARCHITECTURE.md
index 41080bb..23c8ff0 100644
--- a/brev/welcome-ui/SERVER_ARCHITECTURE.md
+++ b/brev/welcome-ui/SERVER_ARCHITECTURE.md
@@ -126,7 +126,7 @@ The server operates in **two distinct modes** depending on sandbox readiness:
 | `LOG_FILE` | `/tmp/nemoclaw-sandbox-create.log` | Sandbox creation log (written by subprocess) |
 | `PROVIDER_CONFIG_CACHE` | `/tmp/nemoclaw-provider-config-cache.json` | Provider config values cache |
 | `OTHER_AGENTS_YAML` | `ROOT/other-agents.yaml` | YAML modal definition file |
-| `NEMOCLAW_IMAGE` | `ghcr.io/nvidia/nemoclaw-community/sandboxes/nemoclaw:local` | (Currently unused, commented out) |
+| `NEMOCLAW_IMAGE` | `ghcr.io/nvidia/openshell-community/sandboxes/nemoclaw:local` | (Currently unused, commented out) |
 | `SANDBOX_PORT` | `18789` | Port the sandbox listens on (localhost) |
 
 ### Hardcoded Constants
diff --git a/brev/welcome-ui/server.js b/brev/welcome-ui/server.js
index dcfbb2a..713cfae 100644
--- a/brev/welcome-ui/server.js
+++ b/brev/welcome-ui/server.js
@@ -32,7 +32,7 @@ const PORT = parseInt(process.env.PORT || "8081", 10);
 const ROOT = __dirname;
 const REPO_ROOT = process.env.REPO_ROOT || path.join(ROOT, "..", "..");
 const SANDBOX_DIR = path.join(REPO_ROOT, "sandboxes", "nemoclaw");
-const NEMOCLAW_IMAGE = "ghcr.io/nvidia/nemoclaw-community/sandboxes/nemoclaw:local";
+const NEMOCLAW_IMAGE = "ghcr.io/nvidia/openshell-community/sandboxes/nemoclaw:local";
 const POLICY_FILE = path.join(SANDBOX_DIR, "policy.yaml");
 
 const LOG_FILE = "/tmp/nemoclaw-sandbox-create.log";
diff --git a/sandboxes/nemoclaw/Dockerfile b/sandboxes/nemoclaw/Dockerfile
index 3fd648c..5b91c7d 100644
--- a/sandboxes/nemoclaw/Dockerfile
+++ b/sandboxes/nemoclaw/Dockerfile
@@ -11,7 +11,7 @@
 # Build:  docker build -t nemoclaw .
 # Run:    nemoclaw sandbox create --from nemoclaw --forward 18789 -- nemoclaw-start
 
-ARG BASE_IMAGE=ghcr.io/nvidia/nemoclaw-community/sandboxes/openclaw:latest
+ARG BASE_IMAGE=ghcr.io/nvidia/openshell-community/sandboxes/openclaw:latest
 FROM ${BASE_IMAGE}
 
 USER root
diff --git a/sandboxes/openclaw/README.md b/sandboxes/openclaw/README.md
index 05a1770..510a5d7 100644
--- a/sandboxes/openclaw/README.md
+++ b/sandboxes/openclaw/README.md
@@ -18,7 +18,7 @@ docker build -t openshell-openclaw .
 To build against a specific base image:
 
 ```bash
-docker build -t openshell-openclaw --build-arg BASE_IMAGE=openshell/sandbox:v0.1.0 .
+docker build -t openshell-openclaw --build-arg BASE_IMAGE=ghcr.io/nvidia/openshell-community/sandboxes/base:latest .
 ```
 
 ## Usage