diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 154fbf6..4d07138 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,5 @@
 default:
-  image: docker:28.5.1-dind
-  services:
-    - "docker:28.5.1-dind"
+  image: quay.io/podman/stable
 
 variables:
   DOCKER_TLS_CERTDIR: "/certs"
@@ -10,6 +8,7 @@ variables:
 stages:
   - test
   - build-and-push-image
+  - push-retagged-branch
   - push-retagged-latest
 
 test:
@@ -25,17 +24,29 @@ build-and-push-image:
   stage: build-and-push-image
   script:
     - git submodule update --init
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker build -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" .
-    - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
+    - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - podman build -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" .
+    - podman push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
+
+push-retagged-branch:
+  stage: push-retagged-latest
+  script:
+    - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - podman pull "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
+    - podman tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
+    - podman push "$CI_REGISTRY_IMAGE:latest"
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push"
+      when: on_success
+
 
 push-retagged-latest:
   stage: push-retagged-latest
   script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker pull "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
-    - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:latest"
-    - docker push "$CI_REGISTRY_IMAGE:latest"
+    - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - podman pull "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
+    - podman tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:latest"
+    - podman push "$CI_REGISTRY_IMAGE:latest"
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"
       when: on_success