diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1e2f3c981572aaddb9084413ef48d46def3497e1..d97ab1df05e362a2df0b6aaa4bbca1b0e4341496 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,40 @@
+# Copyright 2020 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 FROM openjdk:8u201-jdk-alpine
 ENV APP_FILE gateway-1.0.0.jar
 ENV APP_HOME /usr/app
+ENV UID=166
+ENV GID=166
+ENV USER_NAME=eguser
+ENV GROUP_NAME=eggroup
+
 EXPOSE 8080
-COPY target/*.jar $APP_HOME/
+
+# # CREATE APP USER ##
+# Set umask
+RUN sed -i "s|umask 022|umask 027|g" /etc/profile &&\
+    mkdir -p -m 750 $APP_HOME &&\
+    apk update &&\
+    apk add shadow &&\
+    groupadd -r -g $GID $GROUP_NAME &&\
+    useradd -r -u $UID -g $GID -d $APP_HOME -s /sbin/nologin -c "Docker image user" $USER_NAME &&\
+    chown -R $USER_NAME:$GROUP_NAME $APP_HOME
+
+COPY --chown=$USER_NAME:$GROUP_NAME target/*.jar $APP_HOME/
+
 WORKDIR $APP_HOME
+
 ENTRYPOINT ["sh", "-c"]
-CMD ["exec java -cp ./configs:$APP_FILE org.springframework.boot.loader.JarLauncher"]
+CMD ["exec java -cp ./configs:$APP_FILE org.springframework.boot.loader.JarLauncher"]
\ No newline at end of file