diff --git a/docker/code-analysis/Dockerfile b/docker/code-analysis/Dockerfile
index 2be343f5e5e2159ca641edd5f7a06061e7d2b5ac..e4789fa44d60543a880f438d240dd5ebd84f8c62 100644
--- a/docker/code-analysis/Dockerfile
+++ b/docker/code-analysis/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:18.04
 LABEL maintainer="suru.dissanaike@iopsys.eu"
 LABEL build="docker build -t iopsys-codeanalysis ."
 LABEL run="docker run -d --name codeanalysis --rm -v ${PWD}:/opt/work -e LOCAL_USER_ID=`id -u $USER` iopsys-codeanalysis"
-LABEL exec="docker exec --user=user -it codeanalysis bash"
+LABEL exec="docker exec -it codeanalysis bash"
 
 
 RUN \
diff --git a/docker/code-analysis/entrypoint.sh b/docker/code-analysis/entrypoint.sh
index 20278073075d463e8b3a9008ddb3fac7cf868410..dd7f3aed87cc5e099ea8c4f4cafe9bb910e8afa2 100755
--- a/docker/code-analysis/entrypoint.sh
+++ b/docker/code-analysis/entrypoint.sh
@@ -1,11 +1,4 @@
 #!/bin/bash
 
-# Create user
-USER_ID=${LOCAL_USER_ID:-9001}
-useradd --shell /bin/bash -u $USER_ID -G sudo -o -c "" -m user
-adduser --disabled-password user
-export HOME=/home/user
-echo "user ALL = NOPASSWD : ALL" >> /etc/sudoers
-
 # Start supervisor
 /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf -l /var/log/supervisord.log -j /var/run/supervisord.pid