diff --git a/Dockerfile b/Dockerfile
index c82d050..eb9e2bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,16 +8,16 @@ FROM ubuntu:22.04@sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e49
 ARG CONTAINERBASE_VERSION
 ARG APT_HTTP_PROXY
 
-LABEL org.opencontainers.image.source="https://github.com/containerbase/gitpod" \
+LABEL org.opencontainers.image.source="https://github.com/containerbase/devcontainer" \
       org.opencontainers.image.version="${CONTAINERBASE_VERSION}"
 
 # Compatibillity
-LABEL org.label-schema.vcs-url="https://github.com/containerbase/gitpod" \
+LABEL org.label-schema.vcs-url="https://github.com/containerbase/devcontainer" \
       org.label-schema.version="${CONTAINERBASE_VERSION}"
 
-ARG USER_NAME=gitpod
-ARG USER_ID=33333
-ARG PRIMARY_GROUP_ID=33333
+ARG USER_NAME=vscode
+ARG USER_ID=1000
+ARG PRIMARY_GROUP_ID=1000
 
 # Set env and shell
 ENV BASH_ENV=/usr/local/etc/env ENV=/usr/local/etc/env PATH=/home/$USER_NAME/bin:$PATH
@@ -31,7 +31,7 @@ COPY --from=containerbase /usr/local/bin/ /usr/local/bin/
 COPY --from=containerbase /usr/local/containerbase/ /usr/local/containerbase/
 RUN install-containerbase
 
-# add required gitpod and other system packages
+# add required devcontainer and other system packages
 RUN set -ex; \
   install-apt \
     g++ \
@@ -68,7 +68,7 @@ RUN corepack enable
 # renovate: datasource=github-releases packageName=containerbase/python-prebuild
 RUN install-tool python 3.12.0
 
-# prepare some tools for gitpod
+# prepare some tools for devcontainer
 #RUN prepare-tool python
 
 USER $USER_NAME
diff --git a/README.md b/README.md
index 76ec42c..eafea6a 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
-# containerbase gitpod
+# containerbase devcontainer
 
-[![Build status](https://github.com/containerbase/gitpod/actions/workflows/build.yml/badge.svg)](https://github.com/containerbase/gitpod/actions/workflows/build.yml?query=branch%3Amain)
-![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/containerbase/gitpod)
-![License: MIT](https://img.shields.io/github/license/containerbase/gitpod)
+[![Build status](https://github.com/containerbase/devcontainer/actions/workflows/build.yml/badge.svg)](https://github.com/containerbase/devcontainer/actions/workflows/build.yml?query=branch%3Amain)
+![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/containerbase/devcontainer)
+![License: MIT](https://img.shields.io/github/license/containerbase/devcontainer)
 
-A docker base image for Gitpod usage.
+A Docker base image for Visual Studio Code Dev Containers usage.
 
-This repository is the source for the Github container registry image [`ghcr.io/containerbase/gitpod`](https://github.com/containerbase/gitpod/pkgs/container/gitpod).
+This repository is the source for the Github container registry image [`ghcr.io/containerbase/devcontainer`](https://github.com/containerbase/devcontainer/pkgs/container/devcontainer).
 Commits to `main` branch are automatically build and published.
 
 This image allows `sudo` without password.
diff --git a/builder.json b/builder.json
index 770c6a6..9e16cc9 100644
--- a/builder.json
+++ b/builder.json
@@ -1,5 +1,5 @@
 {
-  "image": "gitpod",
+  "image": "devcontainer",
   "versioning": "semver",
   "startVersion": "9.25.0",
   "cache": "docker-build-cache",