diff --git a/Dockerfile b/Dockerfile
index e144004b..1232cb4e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,17 +28,17 @@ RUN apt-get update && apt-get install -y curl \
 # pender user
 RUN mkdir -p ${DIRPATH}
 RUN useradd ${APP} -s /bin/bash -m
-USER ${APP}
 WORKDIR ${DIRPATH}
 
 # install our app
-COPY --chown=${APP} Gemfile Gemfile.lock ./
+COPY Gemfile Gemfile.lock ./
 RUN gem install bundler -v ${BUNDLER_VERSION} --no-document \
-    && bundle install --jobs 20 --retry 5
-COPY --chown=${APP} . ./
+&& bundle install --jobs 20 --retry 5
+COPY . ./
+RUN chmod +x ./bin/docker-entrypoint.sh
 
 # DEV
-RUN chmod +x ./bin/docker-entrypoint.sh
+USER ${APP}
 EXPOSE 3200
 ENTRYPOINT ["./bin/docker-entrypoint.sh"]
 
diff --git a/test/setup-parallel b/test/setup-parallel
index edd0c4e9..683f77a0 100755
--- a/test/setup-parallel
+++ b/test/setup-parallel
@@ -6,7 +6,6 @@ FAIL=0
 
 rm -rf /app/pender/tmp/cache /app/pender/tmp/cache1 /app/pender/tmp/cache2 /app/pender/tmp/cache3
 mkdir -p /app/pender/tmp/cache /app/pender/tmp/cache1 /app/pender/tmp/cache2 /app/pender/tmp/cache3
-chmod 0664 /app/pender/log
 
 bundle exec rake db:create db:migrate &
 TEST_ENV_NUMBER=1 bundle exec rake db:create db:migrate &