diff --git a/deploy/build_env/services-linux/Dockerfile b/deploy/build_env/services-linux/Dockerfile
index 0a351fce993271204351e28308a9f5ae779df4e4..a1743a74fb43205a9520c2d5e9fef72d28e1117e 100644
--- a/deploy/build_env/services-linux/Dockerfile
+++ b/deploy/build_env/services-linux/Dockerfile
@@ -11,6 +11,7 @@ RUN set -eux; \
 		libcurl4-openssl-dev \
 		nomad \
 		grpc-proto \
+		python3-dev \
 	; \
 	rm -rf /var/lib/apt/lists/*
 
diff --git a/deploy/build_env/services-linux/gitlab-ci-build-docker.yml b/deploy/build_env/services-linux/gitlab-ci-build-docker.yml
index a8857acd5eb814c50fc7dab35912cfe84778e98f..9c627931c5cef211e73ca971bae083eab696b47d 100644
--- a/deploy/build_env/services-linux/gitlab-ci-build-docker.yml
+++ b/deploy/build_env/services-linux/gitlab-ci-build-docker.yml
@@ -2,6 +2,7 @@ docker-create-asapo-services-linux-build-env:
   image:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
+  stage: build-containers
   script:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - /kaniko/executor --cache=false --context $CI_PROJECT_DIR/deploy/build_env/services-linux --dockerfile $CI_PROJECT_DIR/deploy/build_env/services-linux/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-services-linux-build-env:${CI_COMMIT_REF_SLUG} --destination $CI_REGISTRY_IMAGE/asapo-services-linux-build-env:latest
diff --git a/deploy/build_env/services-windows/gitlab-ci-build-docker.yml b/deploy/build_env/services-windows/gitlab-ci-build-docker.yml
index 16176c0fdfd5a6a5a6fd5e932af9e2ac15530364..3ec060acd071279531b87a55680e8c9399a73e31 100644
--- a/deploy/build_env/services-windows/gitlab-ci-build-docker.yml
+++ b/deploy/build_env/services-windows/gitlab-ci-build-docker.yml
@@ -2,6 +2,7 @@ docker-create-asapo-services-windows-build-env:
   image:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
+  stage: build-containers
   script:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - /kaniko/executor --cache=false --context $CI_PROJECT_DIR/deploy/build_env/services --dockerfile $CI_PROJECT_DIR/deploy/build_env/services/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-services-build-env:${CI_COMMIT_REF_SLUG} --destination $CI_REGISTRY_IMAGE/asapo-services-build-env:latest