diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1367c8a..e1251b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,8 +137,8 @@ haproxy:dev:
     export IMAGE_TAG_ROLLING_COMMIT="git-$CI_COMMIT_SHORT_SHA-$HAPROXY_VERSION"
     export IMAGE_TAG_ROLLING_GITREF="$CI_COMMIT_REF_SLUG-$HAPROXY_VERSION"
 
-    export IMAGE_TAG_VERSIONS="$HAPROXY_VERSION"
-    export IMAGE_TAG_SHORTVER="$HAPROXY_SHORTVER"
+    export IMAGE_TAG_VERSIONS="$HAPROXY_VERSION-$DEBIAN_CODENAME"
+    export IMAGE_TAG_SHORTVER="$HAPROXY_SHORTVER-$DEBIAN_CODENAME"
     if [ "$CI_COMMIT_REF_NAME" != "$CI_DEFAULT_BRANCH" ]; then
       export IMAGE_TAG_VERSIONS="branch-$CI_COMMIT_REF_SLUG-$IMAGE_TAG_VERSIONS"
       export IMAGE_TAG_SHORTVER="branch-$CI_COMMIT_REF_SLUG-$IMAGE_TAG_SHORTVER"