diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fba7a4ac99d50eb316bc7605ffa494293694e621..cdb8e71fff7f9c36a5e274d8a41cc890676ca3b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -330,6 +330,9 @@ build-front:
   stage: deploy
   script:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - cd $CI_PROJECT_DIR/build/deploy/asapo_services_light
+    - ./prepare-docker.sh
+    - /kaniko/executor --cache=false --single-snapshot --context $CI_PROJECT_DIR/build/deploy/asapo_services_light --dockerfile $CI_PROJECT_DIR/build/deploy/asapo_services_light/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-standalone${CONTAINER_TAG} --destination $CI_REGISTRY_IMAGE/asapo-standalone${CONTAINER_TAG_LATEST}
     - services="broker authorizer discovery receiver file-transfer"
     - >
       for service in $services; do
@@ -343,22 +346,6 @@ build-front:
     - kubernetes-executor
   dependencies:
     - build-services-linux-release
-
-build-standalone-podman:
-  image:
-    name: quay.io/podman/stable
-  stage: deploy
-  script:
-    - cd $CI_PROJECT_DIR/build/deploy/asapo_services_light
-    - ./prepare-docker.sh
-    - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
-    - podman build -t "$CI_REGISTRY_IMAGE/asapo-standalone-dev:${CI_COMMIT_SHORT_SHA}" .
-#    - /kaniko/executor --cache=false --single-snapshot --context $CI_PROJECT_DIR/build/deploy/asapo_services_light --dockerfile $CI_PROJECT_DIR/build/deploy/asapo_services_light/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-standalone${CONTAINER_TAG} --destination $CI_REGISTRY_IMAGE/asapo-standalone${CONTAINER_TAG_LATEST}
-    - podman push "$CI_REGISTRY_IMAGE/asapo-standalone-dev:${CI_COMMIT_SHORT_SHA}"
-  tags:
-    - kubernetes-executor
-  dependencies:
-    - build-services-linux-release
     - build-front
 
 build-services-docker-dev: