diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29015c8..9dc7c07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,11 +38,11 @@ build_module:
   script:
     - sed -i 's/ARCH_FILTER=.*/ARCH_FILTER=linux%/' Makefile
     - make install
-    - cp -rT "/ioc/modules/counterbox/$(ls -U /ioc/modules/counterbox/ | head -1)" "./counterbox-${CI_COMMIT_SHORT_SHA}"
+    - cp -rT "/ioc/modules/counterbox/$(ls -U /ioc/modules/counterbox/ | head -1)" "./counterbox-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
   artifacts:
-    name: "counterbox-${CI_COMMIT_SHORT_SHA}"
+    name: "counterbox-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
     paths:
-      - "counterbox-${CI_COMMIT_SHORT_SHA}/*"
+      - "counterbox-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}/*"
     expire_in: 1 week
   when: always
   tags: