diff --git a/nightly-6.1/debian/12/Dockerfile b/nightly-6.1/debian/12/Dockerfile
index ed7da96c..3ef97baa 100644
--- a/nightly-6.1/debian/12/Dockerfile
+++ b/nightly-6.1/debian/12/Dockerfile
@@ -1,8 +1,5 @@
 FROM debian:12
 
-RUN groupadd -g 998 build-user && \
-    useradd -m -r -u 998 -g build-user build-user
-
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
     apt-get -q install -y \
     binutils-gold \
@@ -65,9 +62,5 @@ RUN set -e; \
 
 ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
 
-USER build-user
-
-WORKDIR /home/build-user
-
 # Print Installed Swift Version
 RUN swift --version
diff --git a/nightly-6.1/debian/12/buildx/Dockerfile b/nightly-6.1/debian/12/buildx/Dockerfile
index eb994748..38df7e01 100644
--- a/nightly-6.1/debian/12/buildx/Dockerfile
+++ b/nightly-6.1/debian/12/buildx/Dockerfile
@@ -1,8 +1,5 @@
 FROM debian:12 as Base
 
-RUN groupadd -g 998 build-user && \
-    useradd -m -r -u 998 -g build-user build-user
-
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
     apt-get -q install -y \
     binutils-gold \
@@ -75,9 +72,5 @@ RUN set -e; \
 
 ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
 
-USER build-user
-
-WORKDIR /home/build-user
-
 # Print Installed Swift Version
 RUN swift --version
diff --git a/nightly-6.1/fedora/39/Dockerfile b/nightly-6.1/fedora/39/Dockerfile
index bf9b451d..7a6a6cf3 100644
--- a/nightly-6.1/fedora/39/Dockerfile
+++ b/nightly-6.1/fedora/39/Dockerfile
@@ -2,9 +2,6 @@ FROM fedora:39
 LABEL maintainer="Swift Infrastructure <swift-infrastructure@forums.swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
-RUN groupadd -g 998 build-user && \
-    useradd -m -r -u 998 -g build-user build-user
-
 RUN yum -y install \
   binutils \
   gcc \
@@ -67,9 +64,5 @@ RUN set -e; \
 
 ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
 
-USER build-user
-
-WORKDIR /home/build-user
-
 # Print Installed Swift Version
 RUN swift --version
diff --git a/nightly-6.1/fedora/39/buildx/Dockerfile b/nightly-6.1/fedora/39/buildx/Dockerfile
index 0346612b..559d2171 100644
--- a/nightly-6.1/fedora/39/buildx/Dockerfile
+++ b/nightly-6.1/fedora/39/buildx/Dockerfile
@@ -2,9 +2,6 @@ FROM fedora:39 AS base
 LABEL maintainer="Swift Infrastructure <swift-infrastructure@forums.swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
-RUN groupadd -g 998 build-user && \
-    useradd -m -r -u 998 -g build-user build-user
-
 RUN yum -y install \
   binutils \
   gcc \
@@ -77,9 +74,5 @@ RUN set -e; \
 
 ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
 
-USER build-user
-
-WORKDIR /home/build-user
-
 # Print Installed Swift Version
 RUN swift --version
diff --git a/nightly-6.2/debian/12/Dockerfile b/nightly-6.2/debian/12/Dockerfile
index 9cc79df6..74d212d8 100644
--- a/nightly-6.2/debian/12/Dockerfile
+++ b/nightly-6.2/debian/12/Dockerfile
@@ -1,8 +1,5 @@
 FROM debian:12
 
-RUN groupadd -g 998 build-user && \
-    useradd -m -r -u 998 -g build-user build-user
-
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
     apt-get -q install -y \
     binutils-gold \
@@ -65,9 +62,5 @@ RUN set -e; \
 
 ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
 
-USER build-user
-
-WORKDIR /home/build-user
-
 # Print Installed Swift Version
 RUN swift --version
diff --git a/nightly-6.2/debian/12/buildx/Dockerfile b/nightly-6.2/debian/12/buildx/Dockerfile
index 5a914861..2f9d797b 100644
--- a/nightly-6.2/debian/12/buildx/Dockerfile
+++ b/nightly-6.2/debian/12/buildx/Dockerfile
@@ -1,8 +1,5 @@
 FROM debian:12 as Base
 
-RUN groupadd -g 998 build-user && \
-    useradd -m -r -u 998 -g build-user build-user
-
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
     apt-get -q install -y \
     binutils-gold \
@@ -75,9 +72,5 @@ RUN set -e; \
 
 ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
 
-USER build-user
-
-WORKDIR /home/build-user
-
 # Print Installed Swift Version
 RUN swift --version
diff --git a/nightly-6.2/fedora/39/Dockerfile b/nightly-6.2/fedora/39/Dockerfile
index 0f2a8db7..e94c3689 100644
--- a/nightly-6.2/fedora/39/Dockerfile
+++ b/nightly-6.2/fedora/39/Dockerfile
@@ -2,9 +2,6 @@ FROM fedora:39
 LABEL maintainer="Swift Infrastructure <swift-infrastructure@forums.swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
-RUN groupadd -g 998 build-user && \
-    useradd -m -r -u 998 -g build-user build-user
-
 RUN yum -y install \
   binutils \
   gcc \
@@ -67,9 +64,5 @@ RUN set -e; \
 
 ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
 
-USER build-user
-
-WORKDIR /home/build-user
-
 # Print Installed Swift Version
 RUN swift --version
\ No newline at end of file
diff --git a/nightly-6.2/fedora/39/buildx/Dockerfile b/nightly-6.2/fedora/39/buildx/Dockerfile
index ca10cd5a..59ed0737 100644
--- a/nightly-6.2/fedora/39/buildx/Dockerfile
+++ b/nightly-6.2/fedora/39/buildx/Dockerfile
@@ -2,9 +2,6 @@ FROM fedora:39 AS base
 LABEL maintainer="Swift Infrastructure <swift-infrastructure@forums.swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
-RUN groupadd -g 998 build-user && \
-    useradd -m -r -u 998 -g build-user build-user
-
 RUN yum -y install \
   binutils \
   gcc \
@@ -77,9 +74,5 @@ RUN set -e; \
 
 ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
 
-USER build-user
-
-WORKDIR /home/build-user
-
 # Print Installed Swift Version
 RUN swift --version
\ No newline at end of file
diff --git a/nightly-main/debian/12/Dockerfile b/nightly-main/debian/12/Dockerfile
index 9df2b8e9..d8ef580b 100644
--- a/nightly-main/debian/12/Dockerfile
+++ b/nightly-main/debian/12/Dockerfile
@@ -1,8 +1,5 @@
 FROM debian:12
 
-RUN groupadd -g 998 build-user && \
-    useradd -m -r -u 998 -g build-user build-user
-
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
     apt-get -q install -y \
     binutils-gold \
@@ -68,9 +65,5 @@ RUN set -e; \
 
 ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
 
-USER build-user
-
-WORKDIR /home/build-user
-
 # Print Installed Swift Version
 RUN swift --version
diff --git a/nightly-main/debian/12/buildx/Dockerfile b/nightly-main/debian/12/buildx/Dockerfile
index 39934fc3..080c6a36 100644
--- a/nightly-main/debian/12/buildx/Dockerfile
+++ b/nightly-main/debian/12/buildx/Dockerfile
@@ -1,8 +1,5 @@
 FROM debian:12 as Base
 
-RUN groupadd -g 998 build-user && \
-    useradd -m -r -u 998 -g build-user build-user
-
 ENV DEBIAN_FRONTEND="noninteractive"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
@@ -77,9 +74,5 @@ RUN set -e; \
 
 ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
 
-USER build-user
-
-WORKDIR /home/build-user
-
 # Print Installed Swift Version
 RUN swift --version
diff --git a/nightly-main/fedora/39/Dockerfile b/nightly-main/fedora/39/Dockerfile
index 96463d8e..678fbbb5 100644
--- a/nightly-main/fedora/39/Dockerfile
+++ b/nightly-main/fedora/39/Dockerfile
@@ -2,9 +2,6 @@ FROM fedora:39
 LABEL maintainer="Swift Infrastructure <swift-infrastructure@forums.swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
-RUN groupadd -g 998 build-user && \
-    useradd -m -r -u 998 -g build-user build-user
-
 RUN yum -y install \
   binutils \
   gcc \
@@ -67,9 +64,5 @@ RUN set -e; \
 
 ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
 
-USER build-user
-
-WORKDIR /home/build-user
-
 # Print Installed Swift Version
 RUN swift --version
\ No newline at end of file
diff --git a/nightly-main/fedora/39/buildx/Dockerfile b/nightly-main/fedora/39/buildx/Dockerfile
index e2ccbe5b..5cefaba3 100644
--- a/nightly-main/fedora/39/buildx/Dockerfile
+++ b/nightly-main/fedora/39/buildx/Dockerfile
@@ -2,9 +2,6 @@ FROM fedora:39 AS base
 LABEL maintainer="Swift Infrastructure <swift-infrastructure@forums.swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
-RUN groupadd -g 998 build-user && \
-    useradd -m -r -u 998 -g build-user build-user
-
 RUN yum -y install \
   binutils \
   gcc \
@@ -77,9 +74,5 @@ RUN set -e; \
 
 ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
 
-USER build-user
-
-WORKDIR /home/build-user
-
 # Print Installed Swift Version
 RUN swift --version
\ No newline at end of file