diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f95fd97..846e5e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,8 +7,9 @@ variables:
   DOCKER_TLS_CERTDIR: "/certs"
   IMAGE_TAG: "${CI_COMMIT_REF_SLUG}"
 stages:
-  - build-image
-  - push
+  - test
+  - build-and-push-image
+  - push-retagged-latest
 
 test:
   image: rust:alpine3.22
@@ -20,7 +21,7 @@ before_script:
   - git submodule update --init
   - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
-build-image:
+build-and-push-image:
   stage: build-image
   script:
     - docker build -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" .