diff --git a/4/Dockerfile b/4/Dockerfile
index 041897a..6c65b8d 100644
--- a/4/Dockerfile
+++ b/4/Dockerfile
@@ -4,14 +4,23 @@ LABEL maintainer="Naoki Takezoe <takezoe [at] gmail.com>"
 
 ADD https://github.com/gitbucket/gitbucket/releases/download/4.33.0/gitbucket.war /opt/gitbucket.war
 
-RUN ln -s /gitbucket /root/.gitbucket
+ENV GITBUCKET_HOME=/gitbucket
+
+# Give permissions for root group
+RUN chmod g=u /opt/gitbucket.war && \
+    mkdir -p $GITBUCKET_HOME && \
+    chmod g+w $GITBUCKET_HOME
+
+VOLUME $GITBUCKET_HOME
 
-VOLUME /gitbucket
 
 # Port for web page
 EXPOSE 8080
 # Port for SSH access to git repository (Optional)
 EXPOSE 29418
 
+ARG USERID=1001
+USER ${USERID}
+
 CMD ["sh", "-c", "java -jar /opt/gitbucket.war"]