diff --git a/Jenkinsfile b/Jenkinsfile
index 5ff70e1a6d3002e5bb495d5c6131b2db680abdf8..91f78bc6d0ce92464b36a8a03938f812e176a18d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,7 +32,7 @@ pipeline {
   stages {
     stage('Initial Cleanup') {
        steps {
-          sh './gradlew clean'
+          sh 'GRADLE_USER_HOME=. && ./gradlew clean'
        }
     }
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f1cfe2c440dcc06dbf8547bbe1eacdc8eb4afaee..7501faf1ba6d14708ac5b8d4641933438768f7db 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,6 @@
 FROM openjdk:13-jdk-alpine
 
-RUN apk update && \
+RUN echo "jenkins:x:2030:100:guest:/dev/null:/sbin/nologin" >> /etc/passwd && \
+    apk update && \
     apk add git openssh zip R bash