diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index 638b439..7a79ede 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -24,7 +24,9 @@ jobs:
       - name: Build and Push to GitHub Container Registry
         uses: docker/build-push-action@v4
         with:
-          build-args: --build-arg=DESKTOP_ENVIRONMENT_USER=${{ env.REPOSITORY_OWNER }} --build-arg=DESKTOP_ENVIRONMENT_GITHUB_USER=${{ env.REPOSITORY_OWNER }}
+          build-args: |
+            DESKTOP_ENVIRONMENT_USER=${{ env.REPOSITORY_OWNER }}
+            DESKTOP_ENVIRONMENT_GITHUB_USER=${{ env.REPOSITORY_OWNER }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
           file: docker/Dockerfile
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7ef839f..f304591 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -410,6 +410,8 @@ RUN sed -i 's/allowed_users=console/allowed_users=anybody/' /etc/X11/Xwrapper.co
   mkdir -p /etc/X11/xorg.conf.d && \
   echo 'Section "InputClass"\n Identifier "touchpad"\n MatchIsTouchpad "on"\n Driver "libinput"\n Option "Tapping" "on"\n Option "libinput Accel Speed" "0.5"\nEndSection' > /etc/X11/xorg.conf.d/90-touchpad.conf
 
+RUN echo USER $USER
+
 # Create a non-root user for safe operation
 RUN userdel -r ubuntu && \
   useradd \