diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2195624a6addc0b3428c45ada5bdbe931ed98bc..ed995b622796ce59c163e19972b9bd4a6e23e34c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,7 +49,7 @@ patatrack:
   only:
     variables:
       - $CI_COMMIT_BRANCH =~ /^qa.*$/
-      - $CI_COMMIT_TAG =~ /^v.*$/
+      - $CI_COMMIT_TAG =~ /^cms-patatrack-v.*$/
     changes:
       - cms/patatrack/*
       - cms/patatrack/ci-scripts/*
@@ -68,7 +68,7 @@ simpletrack:
   only:
     variables:
     - $CI_COMMIT_BRANCH =~ /^qa.*$/
-    - $CI_COMMIT_TAG =~ /^v.*$/
+    - $CI_COMMIT_TAG =~ /^simpletrack-v.*$/
     changes:
     - lhc/simpletrack/Dockerfile.*
     - lhc/simpletrack/lhc-simpletrack.*
diff --git a/cms/cms-patatrack-ci.yml b/cms/cms-patatrack-ci.yml
index ba722bcb013dd45ada45a9db706343b6ba0e8f28..1e470d90ed5299952cfff8aaf4a1cf40516b07e8 100644
--- a/cms/cms-patatrack-ci.yml
+++ b/cms/cms-patatrack-ci.yml
@@ -170,6 +170,6 @@ job_test_standalone_image:
             - cms/patatrack/cms-patatrack/utility_scripts/*
     artifacts:
         paths:
-            - ${CI_PROJECT_DIR}/${RESULTS_DIR}
+            - ${CI_PROJECT_DIR}/CI-JOB-${CI_JOB_ID}
         expire_in: 1 week
         when: always
\ No newline at end of file
diff --git a/lhc/simpletrack/.simpletrack-ci.yml b/lhc/simpletrack/.simpletrack-ci.yml
index eb43ed8d088c29d199b7db80efb91a20b57c7c4c..7acd6d3547430127b7cf8f21e56eb9710e1b8127 100644
--- a/lhc/simpletrack/.simpletrack-ci.yml
+++ b/lhc/simpletrack/.simpletrack-ci.yml
@@ -16,7 +16,7 @@ stages:
     name: build/$CI_COMMIT_REF_NAME
   before_script:
   - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-  - export HEP_LATEST="latest"; export HEP_TAG=$CI_COMMIT_TAG; if [ "$CI_COMMIT_REF_NAME" == "qa" ]; then export HEP_LATEST=`echo ci-${CI_COMMIT_REF_NAME}-latest` ; export HEP_TAG=`echo "ci"-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}`; fi
+  - export HEP_LATEST="latest"; export HEP_TAG=`echo ${CI_COMMIT_TAG} | sed -e 's@.*-\(v[0-9\.]*\)@\1@'`; if [ "$CI_COMMIT_REF_NAME" == "qa" ]; then export HEP_LATEST=`echo ci-${CI_COMMIT_REF_NAME}-latest` ; export HEP_TAG=`echo "ci"-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}`; fi
 
 .job_template: &job_test
   stage: test