diff --git a/dockerbuild/Dockerfile.debian-bullseye b/dockerbuild/Dockerfile.debian-bullseye
index 1faea0734..1f101f5d3 100644
--- a/dockerbuild/Dockerfile.debian-bullseye
+++ b/dockerbuild/Dockerfile.debian-bullseye
@@ -9,7 +9,7 @@ RUN curl -s -k $go_pkg_url -o go.tar.gz && \
     rm go.tar.gz
 
 RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
-RUN chmod 777 /home
+RUN chmod 777 /home && chmod 777 /home/jenkins-build
 
 CMD ["/usr/bin/sshd", "-D"]
 
diff --git a/dockerbuild/Dockerfile.debian-buster b/dockerbuild/Dockerfile.debian-buster
index 6365d1e34..c2073dc28 100644
--- a/dockerbuild/Dockerfile.debian-buster
+++ b/dockerbuild/Dockerfile.debian-buster
@@ -9,7 +9,7 @@ RUN curl -s -k $go_pkg_url -o go.tar.gz && \
     rm go.tar.gz
 
 RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
-RUN chmod 777 /home
+RUN chmod 777 /home && chmod 777 /home/jenkins-build
 
 CMD ["/usr/bin/sshd", "-D"]
 
diff --git a/dockerbuild/Dockerfile.debian-sid b/dockerbuild/Dockerfile.debian-sid
index 0da112a7c..03102418f 100644
--- a/dockerbuild/Dockerfile.debian-sid
+++ b/dockerbuild/Dockerfile.debian-sid
@@ -9,7 +9,6 @@ RUN curl -s -k $go_pkg_url -o go.tar.gz && \
     rm go.tar.gz
 
 RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
-RUN chmod 777 /home
-
+RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build
 CMD ["/usr/bin/sshd", "-D"]
 
diff --git a/dockerbuild/Dockerfile.debian-stretch b/dockerbuild/Dockerfile.debian-stretch
index 4e37ddd40..4e4916dd0 100644
--- a/dockerbuild/Dockerfile.debian-stretch
+++ b/dockerbuild/Dockerfile.debian-stretch
@@ -9,7 +9,6 @@ RUN curl -s -k $go_pkg_url -o go.tar.gz && \
     rm go.tar.gz
 
 RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
-RUN chmod 777 /home
-
+RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build
 CMD ["/usr/bin/sshd", "-D"]
 
diff --git a/dockerbuild/Dockerfile.debian-wheezy b/dockerbuild/Dockerfile.debian-wheezy
index ba98aa272..636566f2a 100644
--- a/dockerbuild/Dockerfile.debian-wheezy
+++ b/dockerbuild/Dockerfile.debian-wheezy
@@ -17,7 +17,6 @@ RUN curl -s -k $go_pkg_url -o go.tar.gz && \
     rm go.tar.gz
 
 RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
-RUN chmod 777 /home
-
+RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build
 CMD ["/usr/bin/sshd", "-D"]
 
diff --git a/dockerbuild/Dockerfile.kali-rolling b/dockerbuild/Dockerfile.kali-rolling
index 2825dffe4..f453e4946 100644
--- a/dockerbuild/Dockerfile.kali-rolling
+++ b/dockerbuild/Dockerfile.kali-rolling
@@ -9,7 +9,6 @@ RUN curl -s -k $go_pkg_url -o go.tar.gz && \
     rm go.tar.gz
 
 RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
-RUN chmod 777 /home
-
+RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build
 CMD ["/usr/bin/sshd", "-D"]
 
diff --git a/dockerbuild/Dockerfile.ubuntu-bionic b/dockerbuild/Dockerfile.ubuntu-bionic
index 764eecf58..a93db02a0 100644
--- a/dockerbuild/Dockerfile.ubuntu-bionic
+++ b/dockerbuild/Dockerfile.ubuntu-bionic
@@ -9,7 +9,6 @@ RUN curl -s -k $go_pkg_url -o go.tar.gz && \
     rm go.tar.gz
 
 RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
-RUN chmod 777 /home
-
+RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build
 CMD ["/usr/bin/sshd", "-D"]
 
diff --git a/dockerbuild/Dockerfile.ubuntu-eoan b/dockerbuild/Dockerfile.ubuntu-eoan
index 0b8b81292..86a864f76 100644
--- a/dockerbuild/Dockerfile.ubuntu-eoan
+++ b/dockerbuild/Dockerfile.ubuntu-eoan
@@ -9,7 +9,6 @@ RUN curl -s -k $go_pkg_url -o go.tar.gz && \
     rm go.tar.gz
 
 RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
-RUN chmod 777 /home
-
+RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build
 CMD ["/usr/bin/sshd", "-D"]
 
diff --git a/dockerbuild/Dockerfile.ubuntu-trusty b/dockerbuild/Dockerfile.ubuntu-trusty
index 83b37ea48..a434d6892 100644
--- a/dockerbuild/Dockerfile.ubuntu-trusty
+++ b/dockerbuild/Dockerfile.ubuntu-trusty
@@ -9,7 +9,6 @@ RUN curl -s -k $go_pkg_url -o go.tar.gz && \
     rm go.tar.gz
 
 RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
-RUN chmod 777 /home
-
+RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build
 CMD ["/usr/bin/sshd", "-D"]
 
diff --git a/dockerbuild/Dockerfile.ubuntu-xenial b/dockerbuild/Dockerfile.ubuntu-xenial
index ff1288a7b..6d77bb4e2 100644
--- a/dockerbuild/Dockerfile.ubuntu-xenial
+++ b/dockerbuild/Dockerfile.ubuntu-xenial
@@ -9,7 +9,6 @@ RUN curl -s -k $go_pkg_url -o go.tar.gz && \
     rm go.tar.gz
 
 RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
-RUN chmod 777 /home
-
+RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build
 CMD ["/usr/bin/sshd", "-D"]