diff --git a/Dockerfile b/Dockerfile
index b3a1dc28..566329aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 FROM docker.io/library/node:20-slim
 
-# ENV SANDBOX="gemini-cli-sandbox"
+ARG SANDBOX_NAME="gemini-cli-sandbox"
+ENV SANDBOX="$SANDBOX_NAME"
 
 # install minimal set of packages, then clean up
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/packages/cli/src/ui/components/Footer.tsx b/packages/cli/src/ui/components/Footer.tsx
index e9cece4c..04a2f96f 100644
--- a/packages/cli/src/ui/components/Footer.tsx
+++ b/packages/cli/src/ui/components/Footer.tsx
@@ -56,7 +56,7 @@ export const Footer: React.FC<FooterProps> = ({
     >
       {process.env.SANDBOX && process.env.SANDBOX !== 'sandbox-exec' ? (
         <Text color="green">
-          {process.env.SANDBOX.replace(/^gemini-(?:code-)?/, '')}
+          {process.env.SANDBOX.replace(/^gemini-(?:cli-)?/, '')}
         </Text>
       ) : process.env.SANDBOX === 'sandbox-exec' ? (
         <Text color={Colors.AccentYellow}>
diff --git a/scripts/build_sandbox.sh b/scripts/build_sandbox.sh
index 5997e201..9f6dcfe6 100755
--- a/scripts/build_sandbox.sh
+++ b/scripts/build_sandbox.sh
@@ -26,7 +26,7 @@ fi
 CMD=$(scripts/sandbox_command.sh)
 echo "using $CMD for sandboxing"
 
-IMAGE=gemini-code-sandbox:latest
+IMAGE=gemini-cli-sandbox:latest
 DOCKERFILE=Dockerfile
 
 SKIP_NPM_INSTALL_BUILD=false