diff --git a/Dockerfile b/Dockerfile
index b3c1010..2c10025 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,14 @@
 FROM jboss/base-jdk:8
 
-MAINTAINER Erik Jacobs <erikmjacobs@gmail.com>
-MAINTAINER Siamak Sadeghianfar <siamaksade@gmail.com>
-
 ENV SONAR_VERSION=6.7 \
     SONARQUBE_HOME=/opt/sonarqube \
     SONARQUBE_JDBC_USERNAME=sonar \
     SONARQUBE_JDBC_PASSWORD=sonar \
     SONARQUBE_JDBC_URL=
 
-USER root
+USER sonarqube
 EXPOSE 9000
-ADD root /
+ADD sonarqube /
 
 RUN set -x \