diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f141b99..fc638a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ validate:
   tags:
     - docker
 
-validate_show_highstate_leap_15.0:
+leap15.0_show_highstate:
   stage: validate
   before_script:
     - bin/prepare_test_env.sh -i opensuse -g
@@ -20,7 +20,7 @@ validate_show_highstate_leap_15.0:
   tags:
     - docker
 
-validate_show_highstate_leap_42.3:
+leap42.3_show_highstate:
   stage: validate
   before_script:
     - bin/prepare_test_env.sh -i opensuse -g -o Leap,42,3
@@ -29,7 +29,7 @@ validate_show_highstate_leap_42.3:
   tags:
     - docker
 
-validate_show_highstate_sle12sp3:
+sle12sp3_show_highstate:
   stage: validate
   before_script:
     - bin/prepare_test_env.sh -i opensuse -g -o SLES,12,3
@@ -38,7 +38,7 @@ validate_show_highstate_sle12sp3:
   tags:
     - docker
 
-validate_show_highstate_sle11sp4:
+sle11sp4_show_highstate:
   stage: validate
   before_script:
     - bin/prepare_test_env.sh -i opensuse -g -o SLES,11,4
@@ -47,7 +47,7 @@ validate_show_highstate_sle11sp4:
   tags:
     - docker
 
-validate_show_highstate_latest_leap_upstream_formulas:
+upstream_formulas_show_highstate:
   stage: validate
   before_script:
     - bin/prepare_test_env.sh -i opensuse -g