diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 731135b7dc269b2cf6e7fbd2e3ea79686472c35d..f137788cff8d34cdd013b6d65f0c876c7f9bd32f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -95,12 +95,26 @@ build-services-docker:
   script:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - services="broker authorizer discovery receiver file-transfer"
-    - >
-      for service in $services; do
-          service_dir=${service//"-"/"_"}
-          if [[ -f $CI_PROJECT_DIR/build/${service_dir}/dependencies ]]; then DEPENDENCY_LIBS=$(<$CI_PROJECT_DIR/build/${service_dir}/dependencies); else DEPENDENCY_LIBS=''; fi
-          IFS='' /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/${service_dir} --dockerfile $CI_PROJECT_DIR/build/${service_dir}/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-dev-${service}:${CI_COMMIT_SHORT_SHA} --build-args "CI_REGISTRY_IMAGE='${CI_REGISTRY_IMAGE}'" --build-args "DEPENDENCY_LIBS='${DEPENDENCY_LIBS}'"
-      done
+    - service="broker"
+    - service_dir=${service//"-"/"_"}
+    - if [[ -f $CI_PROJECT_DIR/build/${service_dir}/dependencies ]]; then DEPENDENCY_LIBS=$(<$CI_PROJECT_DIR/build/${service_dir}/dependencies); else DEPENDENCY_LIBS=''; fi
+    - IFS='' /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/${service_dir} --dockerfile $CI_PROJECT_DIR/build/${service_dir}/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-dev-${service}:${CI_COMMIT_SHORT_SHA} --build-args "CI_REGISTRY_IMAGE='${CI_REGISTRY_IMAGE}'" --build-args "DEPENDENCY_LIBS='${DEPENDENCY_LIBS}'"
+    - service="authorizer"
+    - service_dir=${service//"-"/"_"}
+    - if [[ -f $CI_PROJECT_DIR/build/${service_dir}/dependencies ]]; then DEPENDENCY_LIBS=$(<$CI_PROJECT_DIR/build/${service_dir}/dependencies); else DEPENDENCY_LIBS=''; fi
+    - IFS='' /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/${service_dir} --dockerfile $CI_PROJECT_DIR/build/${service_dir}/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-dev-${service}:${CI_COMMIT_SHORT_SHA} --build-args "CI_REGISTRY_IMAGE='${CI_REGISTRY_IMAGE}'" --build-args "DEPENDENCY_LIBS='${DEPENDENCY_LIBS}'"
+    - service="discovery"
+    - service_dir=${service//"-"/"_"}
+    - if [[ -f $CI_PROJECT_DIR/build/${service_dir}/dependencies ]]; then DEPENDENCY_LIBS=$(<$CI_PROJECT_DIR/build/${service_dir}/dependencies); else DEPENDENCY_LIBS=''; fi
+    - IFS='' /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/${service_dir} --dockerfile $CI_PROJECT_DIR/build/${service_dir}/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-dev-${service}:${CI_COMMIT_SHORT_SHA} --build-args "CI_REGISTRY_IMAGE='${CI_REGISTRY_IMAGE}'" --build-args "DEPENDENCY_LIBS='${DEPENDENCY_LIBS}'"
+    - service="receiver"
+    - service_dir=${service//"-"/"_"}
+    - if [[ -f $CI_PROJECT_DIR/build/${service_dir}/dependencies ]]; then DEPENDENCY_LIBS=$(<$CI_PROJECT_DIR/build/${service_dir}/dependencies); else DEPENDENCY_LIBS=''; fi
+    - IFS='' /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/${service_dir} --dockerfile $CI_PROJECT_DIR/build/${service_dir}/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-dev-${service}:${CI_COMMIT_SHORT_SHA} --build-args "CI_REGISTRY_IMAGE='${CI_REGISTRY_IMAGE}'" --build-args "DEPENDENCY_LIBS='${DEPENDENCY_LIBS}'"
+    - service="file-transfer"
+    - service_dir=${service//"-"/"_"}
+    - if [[ -f $CI_PROJECT_DIR/build/${service_dir}/dependencies ]]; then DEPENDENCY_LIBS=$(<$CI_PROJECT_DIR/build/${service_dir}/dependencies); else DEPENDENCY_LIBS=''; fi
+    - IFS='' /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/${service_dir} --dockerfile $CI_PROJECT_DIR/build/${service_dir}/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-dev-${service}:${CI_COMMIT_SHORT_SHA} --build-args "CI_REGISTRY_IMAGE='${CI_REGISTRY_IMAGE}'" --build-args "DEPENDENCY_LIBS='${DEPENDENCY_LIBS}'"
   tags:
     - kubernetes-executor
   rules: