diff --git a/ci/Dockerfile.bullseye.test_install_unified.armv7 b/ci/Dockerfile.bullseye.test_install_unified.armv7
index 7c19bf08c..ce0f5136d 100644
--- a/ci/Dockerfile.bullseye.test_install_unified.armv7
+++ b/ci/Dockerfile.bullseye.test_install_unified.armv7
@@ -36,17 +36,17 @@ ENV TEST_USER_GROUP=test
 
 RUN groupadd --gid 1002 $TEST_USER_GROUP
 
-ENV USER_PI=pi
-ENV USER_PI_GROUP=$USER_PI
+ARG USER_PI=pi
+ARG USER_PI_GROUP=$USER_PI
 RUN groupadd --gid 1000 $USER_PI_GROUP \
   && useradd -u 1000 -g $USER_PI_GROUP -G sudo,$TEST_USER_PI_GROUP -d /home/$USER_PI -m -s /bin/bash -p '$1$iV7TOwOe$6ojkJQXyEA9bHd/SqNLNj0' $USER_PI \
   && echo "$USER_PI ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER_PI
 
-ENV USER_HANS=hans
-ENV USER_HANS_GROUP=wurst
-RUN groupadd --gid 1001 $USER_HANS_GROUP \
-  && useradd -u 1001 -g $USER_HANS_GROUP -G sudo,$TEST_USER_HANS_GROUP -d /home/$USER_HANS -m -s /bin/bash -p '$1$iV7TOwOe$6ojkJQXyEA9bHd/SqNLNj0' $USER_HANS \
-  && echo "$USER_HANS ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER_HANS
+ARG USER_ALT=hans
+ARG USER_ALT_GROUP=wurst
+RUN groupadd --gid 1001 $USER_ALT_GROUP \
+  && useradd -u 1001 -g $USER_ALT_GROUP -G sudo,$TEST_USER_HANS_GROUP -d /home/$USER_ALT -m -s /bin/bash -p '$1$iV7TOwOe$6ojkJQXyEA9bHd/SqNLNj0' $USER_ALT \
+  && echo "$USER_ALT ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER_ALT
 
 
 FROM user as test