diff --git a/tasks/1-create-deployment.yml b/tasks/1-create-deployment.yml
index 703189a36a56464b827dcca5a5443de37f926b6e..26af13dc9bcd16f93e68fbded3504630c0055a3d 100644
--- a/tasks/1-create-deployment.yml
+++ b/tasks/1-create-deployment.yml
@@ -1,4 +1,9 @@
 ---
+- name: Create workspace directory if not exists
+  file:
+    path: "{{ paas_ci_workdir }}"
+    state: directory
+
 - name: Get template
   get_url:
     url: "{{ paas_ci_test.template_url }}"
diff --git a/utils/Dockerfile b/utils/Dockerfile
index 78cd7e276556ef23d0a5224d436eb479540bc252..adb8ee15d82b3c634f749deb98a987ac579d0633 100644
--- a/utils/Dockerfile
+++ b/utils/Dockerfile
@@ -9,4 +9,10 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \
     && rm orchent_${ORCHENT_VERSION}_amd64.deb \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN pip install gvm-tools jq yq
\ No newline at end of file
+RUN pip install gvm-tools jq yq
+
+RUN useradd jenkins
+
+USER jenkins
+
+