diff --git a/Dockerfile b/Dockerfile
index f1f9e45..d4b63b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,4 +13,8 @@ RUN dpkg -i ./gitsemver.deb && rm gitsemver.deb
 RUN git clone https://gitlab.com/haprotec/haprotec-python-lib.git
 RUN pip install ./haprotec-python-lib
 
-USER gitlab-runner
\ No newline at end of file
+RUN useradd -ms /bin/bash gitlab-runner && \
+    mkdir -p /builds && \
+    chown gitlab-runner /builds 
+WORKDIR /builds
+USER gitlab-runner