diff --git a/docker/code-analysis/Dockerfile b/docker/code-analysis/Dockerfile
index 77006010cad45acfadd06065415905898efc58b8..0adf15802c1a0d3b0fd5031a895e4acc6d01f095 100644
--- a/docker/code-analysis/Dockerfile
+++ b/docker/code-analysis/Dockerfile
@@ -2,8 +2,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 -it codeanalysis bash"
+LABEL run="docker run -it --entrypoint /bin/bash --rm -v ${PWD}:/opt/work iopsys-codeanalysis"
 
 
 RUN \
diff --git a/docker/static-code-analysis/Dockerfile b/docker/static-code-analysis/Dockerfile
index 3b7866bb714d6a3bc0b98da2793c77eded748614..d04346fdd5246472b0bc9b0ac8f6c518157e9dd3 100644
--- a/docker/static-code-analysis/Dockerfile
+++ b/docker/static-code-analysis/Dockerfile
@@ -2,8 +2,7 @@ FROM ubuntu:18.04
 
 LABEL maintainer="suru.dissanaike@iopsys.eu"
 LABEL build="docker build -t iopsys-staticcodeanalysis ."
-LABEL run="docker run -d --name staticcodeanalysis --privileged --rm -v ${PWD}:/opt/work -e LOCAL_USER_ID=`id -u $USER` iopsys-staticcodeanalysis"
-LABEL exec="docker exec --user=user -it staticcodeanalysis bash"
+LABEL run="docker run -it --entrypoint /bin/bash --rm -v ${PWD}:/opt/work iopsys-staticcodeanalysis"
 
 # docker build -t iopsys-staticcodeanalysis .
 # docker images