diff --git a/.devcontainer/armhf/Dockerfile b/.devcontainer/armhf/Dockerfile
index 7d5632a6..7d555f36 100644
--- a/.devcontainer/armhf/Dockerfile
+++ b/.devcontainer/armhf/Dockerfile
@@ -24,7 +24,7 @@ RUN dpkg --add-architecture armhf && \
     && rm -rf /var/lib/apt/lists/*
 
 # Create non-root user with stable UID/GID
-ARG USERNAME=devuser
+ARG USERNAME=vscode
 ARG USER_UID=1000
 ARG USER_GID=1000
 
diff --git a/.devcontainer/i386/Dockerfile b/.devcontainer/i386/Dockerfile
index 99223eb9..bace68cd 100644
--- a/.devcontainer/i386/Dockerfile
+++ b/.devcontainer/i386/Dockerfile
@@ -24,7 +24,7 @@ RUN dpkg --add-architecture i386 && \
     && rm -rf /var/lib/apt/lists/*
 
 # Create non-root user with stable UID/GID
-ARG USERNAME=devuser
+ARG USERNAME=vscode
 ARG USER_UID=1000
 ARG USER_GID=1000
 
diff --git a/.devcontainer/powerpc/Dockerfile b/.devcontainer/powerpc/Dockerfile
index a74cb690..faa94096 100644
--- a/.devcontainer/powerpc/Dockerfile
+++ b/.devcontainer/powerpc/Dockerfile
@@ -49,7 +49,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 
 # Create non-root user with stable UID/GID
-ARG USERNAME=devuser
+ARG USERNAME=vscode
 ARG USER_UID=1000
 ARG USER_GID=1000
 
diff --git a/.devcontainer/riscv64/Dockerfile b/.devcontainer/riscv64/Dockerfile
index 081e42ed..7d07cdda 100644
--- a/.devcontainer/riscv64/Dockerfile
+++ b/.devcontainer/riscv64/Dockerfile
@@ -24,7 +24,7 @@ RUN dpkg --add-architecture riscv64 && \
     && rm -rf /var/lib/apt/lists/*
 
 # Create non-root user with stable UID/GID
-ARG USERNAME=devuser
+ARG USERNAME=vscode
 ARG USER_UID=1000
 ARG USER_GID=1000
 
diff --git a/.devcontainer/s390x/Dockerfile b/.devcontainer/s390x/Dockerfile
index f8c6ff87..5656bc1d 100644
--- a/.devcontainer/s390x/Dockerfile
+++ b/.devcontainer/s390x/Dockerfile
@@ -24,7 +24,7 @@ RUN dpkg --add-architecture s390x && \
     && rm -rf /var/lib/apt/lists/*
 
 # Create non-root user with stable UID/GID
-ARG USERNAME=devuser
+ARG USERNAME=vscode
 ARG USER_UID=1000
 ARG USER_GID=1000