diff --git a/wine/devel/Dockerfile b/wine/devel/Dockerfile
index bb5e7c5..115d377 100644
--- a/wine/devel/Dockerfile
+++ b/wine/devel/Dockerfile
@@ -19,7 +19,7 @@ RUN             apt update
 RUN             apt install --install-recommends winehq-devel cabextract wine-binfmt -y
 
 # Set up Winetricks
-RUN	        wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
+RUN	            wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
                 && chmod +x /usr/sbin/winetricks
 
 ENV             HOME=/home/container
@@ -32,11 +32,5 @@ ENV             DISPLAY_DEPTH=16
 ENV             AUTO_UPDATE=1
 ENV             XVFB=1
 
-## Setup user and working directory
-RUN             useradd -m -d /home/container -s /bin/bash container
-USER            container
-ENV             USER=container HOME=/home/container
-WORKDIR         /home/container
-
 COPY            ./../entrypoint.sh /entrypoint.sh
 CMD             [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/wine/latest/Dockerfile b/wine/latest/Dockerfile
index 6937913..2a1fa6b 100644
--- a/wine/latest/Dockerfile
+++ b/wine/latest/Dockerfile
@@ -19,7 +19,7 @@ RUN             apt update
 RUN             apt install --install-recommends winehq-stable cabextract wine-binfmt -y
 
 # Set up Winetricks
-RUN	        wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
+RUN	            wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
                 && chmod +x /usr/sbin/winetricks
 
 ENV             HOME=/home/container
@@ -32,11 +32,5 @@ ENV             DISPLAY_DEPTH=16
 ENV             AUTO_UPDATE=1
 ENV             XVFB=1
 
-## Setup user and working directory
-RUN             useradd -m -d /home/container -s /bin/bash container
-USER            container
-ENV             USER=container HOME=/home/container
-WORKDIR         /home/container
-
 COPY            ./../entrypoint.sh /entrypoint.sh
 CMD             [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/wine/staging/Dockerfile b/wine/staging/Dockerfile
index 437a37c..01858cb 100644
--- a/wine/staging/Dockerfile
+++ b/wine/staging/Dockerfile
@@ -19,7 +19,7 @@ RUN             apt update
 RUN             apt install --install-recommends winehq-staging cabextract wine-binfmt -y
 
 # Set up Winetricks
-RUN	        wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
+RUN	            wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
                 && chmod +x /usr/sbin/winetricks
 
 ENV             HOME=/home/container
@@ -32,11 +32,5 @@ ENV             DISPLAY_DEPTH=16
 ENV             AUTO_UPDATE=1
 ENV             XVFB=1
 
-## Setup user and working directory
-RUN             useradd -m -d /home/container -s /bin/bash container
-USER            container
-ENV             USER=container HOME=/home/container
-WORKDIR         /home/container
-
 COPY            ./../entrypoint.sh /entrypoint.sh
 CMD             [ "/bin/bash", "/entrypoint.sh" ]