diff --git a/ci/build.yml b/ci/build.yml
index 119446fde7..9a323bf3ba 100644
--- a/ci/build.yml
+++ b/ci/build.yml
@@ -7,7 +7,7 @@ variables:
 
 # Core
 
-build core firmware:
+build core firmware regular:
   stage: build
   script:
     - cd core
@@ -44,13 +44,13 @@ build core firmware bitcoinonly:
     - trezor-*.*.*-$CI_COMMIT_SHORT_SHA-bitcoinonly.bin
     expire_in: 1 week
 
-build core unix:
+build core unix regular:
   stage: build
   script:
     - cd core
     - pipenv run make build_unix
 
-build core unix frozen:
+build core unix frozen regular:
   stage: build
   script:
     - cd core
@@ -110,7 +110,7 @@ build crypto:
 # Legacy
 
 # TODO: add clang https://github.com/trezor/trezor-firmware/issues/44
-build legacy firmware:
+build legacy firmware regular:
   stage: build
   variables:
     MEMORY_PROTECT: "0"
@@ -156,7 +156,7 @@ build legacy firmware bitcoinonly:
     - trezor-*.*.*-$CI_COMMIT_SHORT_SHA-bitcoinonly.bin
     expire_in: 1 week
 
-build legacy emu:
+build legacy emu regular:
   stage: build
   variables:
     DEBUG_LINK: "1"
diff --git a/ci/test.yml b/ci/test.yml
index b76fbcba2d..4c525609b8 100644
--- a/ci/test.yml
+++ b/ci/test.yml
@@ -5,7 +5,7 @@ image: registry.gitlab.com/satoshilabs/trezor/trezor-firmware/environment
 test core unix unit:
   stage: test
   dependencies:
-    - build core unix frozen
+    - build core unix frozen regular
   script:
     - cd core
     - pipenv run make test
@@ -13,7 +13,7 @@ test core unix unit:
 test core unix device:
   stage: test
   dependencies:
-    - build core unix frozen
+    - build core unix frozen regular
   script:
     - cd core
     - pipenv run make test_emu
@@ -32,7 +32,7 @@ test core unix device bitcoinonly:
 test core unix monero:
   stage: test
   dependencies:
-    - build core unix frozen
+    - build core unix frozen regular
   script:
     - cd core
     - pipenv run make test_emu_monero
@@ -58,7 +58,7 @@ test crypto:
 test legacy emu:
   stage: test
   dependencies:
-    - build legacy emu
+    - build legacy emu regular
   variables:
     EMULATOR: "1"
   script:
@@ -104,7 +104,7 @@ test upgrade:
   stage: test
   dependencies:
     - build core unix frozen debug
-    - build legacy emu
+    - build legacy emu regular
   script:
     - tests/upgrade_tests/download_emulators.sh
     - pipenv run pytest tests/upgrade_tests