diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 44e2809..983dea7 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -15,10 +15,19 @@
     apt-get -y dist-upgrade &&  \
     apt-get install -y openjdk-8-jre-headless
 
+RUN groupadd -r onap && useradd --no-log-init -r -g onap clamp
+VOLUME /opt/clamp/config
+RUN mkdir /var/log/onap
+RUN chmod a+rwx /var/log/onap
+
 COPY onap-clamp/clamp.jar /opt/clamp/app.jar
-VOLUME /etc
+RUN chmod 700 /opt/clamp/app.jar
+
 COPY onap-clamp/startService.sh /opt/clamp/startService.sh
 RUN chmod 700 /opt/clamp/startService.sh
 
+RUN chown -R clamp:onap /opt/clamp
+
+USER clamp
 WORKDIR /opt/clamp/
 ENTRYPOINT ./startService.sh