diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy
index 45bf777..45cbc7d 100644
--- a/jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/jenkins/ci-pipelines/ci_stage_2.groovy
@@ -45,12 +45,16 @@
     container_name = "${project}-${branch}".toLowerCase()
 
     stage('Docker-Build') {
-	sh "echo 'RUN groupadd -o -g " + "id -g".execute().text + " -r jenkins \\' >> Dockerfile"
-	sh "echo '	&& useradd -o -u " + "id -u".execute().text + " --create-home -r -g  jenkins jenkins' >> Dockerfile"
         sh "docker build -t ${container_name} ."
     }
 
     withDockerContainer("${container_name}") {
+        stage('Docker-Setup') {
+            sh '''
+               groupadd -o -g $(id -g) -r jenkins
+               useradd -o -u $(id -u) --create-home -r -g  jenkins jenkins
+               '''
+        }
         stage('Test') {
             sh 'devops-stages/stage-test.sh'
         }