diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1451e3141..f1ed4f426 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,6 +5,7 @@ jobs:
   build:
     docker:
       - image: docker.io/sudoproject/debian:latest
+        user: build
     steps:
       - checkout
       - run:
@@ -18,6 +19,7 @@ jobs:
   test:
     docker:
       - image: docker.io/sudoproject/debian:latest
+        user: build
     steps:
       # Reuse the workspace from the build job
       - attach_workspace:
diff --git a/docker/debian/latest/Dockerfile b/docker/debian/latest/Dockerfile
index bb1645151..e07d869b5 100644
--- a/docker/debian/latest/Dockerfile
+++ b/docker/debian/latest/Dockerfile
@@ -6,3 +6,4 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=America/Denver apt-get update && \
 	libsasl2-dev libselinux1-dev libsepol1-dev libssl-dev zlib1g-dev \
 	libaudit-dev libssl-dev python3-dev libpython3-dev \
 	file lsb-release fakeroot procps git ssh openssh-client
+RUN useradd -ms /bin/bash build
diff --git a/docker/debian/testing/Dockerfile b/docker/debian/testing/Dockerfile
index 2ca39ff4b..b21bf61de 100644
--- a/docker/debian/testing/Dockerfile
+++ b/docker/debian/testing/Dockerfile
@@ -6,3 +6,4 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=America/Denver apt-get update && \
 	libsasl2-dev libselinux1-dev libsepol1-dev libssl-dev zlib1g-dev \
 	libaudit-dev libssl-dev python3-dev libpython3-dev \
 	file lsb-release fakeroot procps git ssh openssh-client
+RUN useradd -ms /bin/bash build
diff --git a/docker/fedora/latest/Dockerfile b/docker/fedora/latest/Dockerfile
index ad7d5ab50..de04d96c4 100644
--- a/docker/fedora/latest/Dockerfile
+++ b/docker/fedora/latest/Dockerfile
@@ -5,3 +5,4 @@ RUN dnf -y install audit-libs-devel cyrus-sasl-devel glibc-devel \
     libselinux-devel libsepol-devel openldap-devel openssl-devel pam-devel \
     python3-devel rpm-build zlib-devel binutils ed gcc gdb git openssh \
     procps which
+RUN useradd -ms /bin/bash build
diff --git a/docker/fedora/rawhide/Dockerfile b/docker/fedora/rawhide/Dockerfile
index a16457645..d34a5ec0f 100644
--- a/docker/fedora/rawhide/Dockerfile
+++ b/docker/fedora/rawhide/Dockerfile
@@ -5,3 +5,4 @@ RUN dnf -y install audit-libs-devel cyrus-sasl-devel glibc-devel \
     libselinux-devel libsepol-devel openldap-devel openssl-devel pam-devel \
     python3-devel rpm-build zlib-devel binutils ed gcc gdb git openssh \
     procps which
+RUN useradd -ms /bin/bash build
diff --git a/docker/ubuntu/devel/Dockerfile b/docker/ubuntu/devel/Dockerfile
index 810ce78d0..3ad9c4f03 100644
--- a/docker/ubuntu/devel/Dockerfile
+++ b/docker/ubuntu/devel/Dockerfile
@@ -6,3 +6,4 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=America/Denver apt-get update && \
 	libsasl2-dev libselinux1-dev libsepol1-dev libssl-dev zlib1g-dev \
 	libaudit-dev libssl-dev python3-dev libpython3-dev \
 	file lsb-release fakeroot procps git ssh openssh-client
+RUN useradd -ms /bin/bash build
diff --git a/docker/ubuntu/latest/Dockerfile b/docker/ubuntu/latest/Dockerfile
index f5e6a6180..314e4b199 100644
--- a/docker/ubuntu/latest/Dockerfile
+++ b/docker/ubuntu/latest/Dockerfile
@@ -6,3 +6,4 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=America/Denver apt-get update && \
 	libsasl2-dev libselinux1-dev libsepol1-dev libssl-dev zlib1g-dev \
 	libaudit-dev libssl-dev python3-dev libpython3-dev \
 	file lsb-release fakeroot procps git ssh openssh-client
+RUN useradd -ms /bin/bash build
diff --git a/docker/ubuntu/rolling/Dockerfile b/docker/ubuntu/rolling/Dockerfile
index 41fcfb571..16a3cec6c 100644
--- a/docker/ubuntu/rolling/Dockerfile
+++ b/docker/ubuntu/rolling/Dockerfile
@@ -6,3 +6,4 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=America/Denver apt-get update && \
 	libsasl2-dev libselinux1-dev libsepol1-dev libssl-dev zlib1g-dev \
 	libaudit-dev libssl-dev python3-dev libpython3-dev \
 	file lsb-release fakeroot procps git ssh openssh-client
+RUN useradd -ms /bin/bash build