diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3781b943db0b33f8c8e78f3284720c086af4c5a..fba7a4ac99d50eb316bc7605ffa494293694e621 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -339,9 +339,22 @@ build-front:
     - /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/monitoring/monitoring_server --dockerfile $CI_PROJECT_DIR/monitoring/monitoring_server/docker/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-monitoring-server${CONTAINER_TAG}
     - /kaniko/executor --cache=false --context $CI_PROJECT_DIR/monitoring/monitoring_ui --dockerfile $CI_PROJECT_DIR/monitoring/monitoring_ui/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-monitoring-ui${CONTAINER_TAG}
     - /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/deploy/asapo_services --dockerfile $CI_PROJECT_DIR/build/deploy/asapo_services/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-cluster${CONTAINER_TAG} --destination $CI_REGISTRY_IMAGE/asapo-cluster${CONTAINER_TAG_LATEST}
+  tags:
+    - 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
-    - /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 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: