diff --git a/.gitignore b/.gitignore
index 71c1fc5..3e40a51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 /.idea/
 composer.lock
 /rancherize.json
-/.rancherize
\ No newline at end of file
+/.rancherize
+/scripts/rancherize-test.sh
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 27754f4..4d2e7dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,11 +21,11 @@ ENV HOME=$RANCHERIZE_HOME
 ENV EDITOR=$DEFAULT_EDITOR
 
 # install packages
-RUN apk update \
-	&& apk add --no-cache \
+RUN apk add --no-cache \
 		git \
 		docker \
 		py-pip \
+		su-exec \
 # install docker-compose
 	&& pip install docker-compose==$DOCKER_COMPOSE_VERSION
 
@@ -40,7 +40,6 @@ WORKDIR /opt/rancherize
 
 # install composer packages
 RUN curl -sSL "https://gist.githubusercontent.com/justb81/1006b89e41e41e1c848fe91969af7a0b/raw/c12faf968e659356ec1cb53f313e7f8383836be3/getcomposer.sh" | sh \
-    && ./composer.phar install --no-dev && rm composer.phar
+    && COMPOSER_ALLOW_SUPERUSER=1 ./composer.phar install --no-dev && rm composer.phar
 
-ENTRYPOINT ["/opt/rancherize/rancherize"]
-#ENTRYPOINT ["/bin/sh"]
+ENTRYPOINT ["/bin/sh", "/opt/rancherize/docker-entrypoint.sh"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
new file mode 100644
index 0000000..89dbcd3
--- /dev/null
+++ b/docker-entrypoint.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+USER="root"
+if [ ! -z "$GROUP_ID" ] && [ ! -z "$USER_ID" ] ; then
+	deluser rancherize > /dev/null 2>&1
+	addgroup -g $GROUP_ID rancherize
+	adduser -u $USER_ID -G rancherize -D -s /bin/sh rancherize
+	USER="rancherize"
+fi
+
+if [ -x "$1" ] ; then
+	su-exec "$USER" $*
+	exit $?
+fi
+
+su-exec "$USER" php /opt/rancherize/rancherize $@
\ No newline at end of file