diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09938b50d..bc758ebdc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,10 +38,10 @@ build core firmware:
     - pipenv run make build_firmware
     # - test "$TREZOR_MODEL" = "1" || pipenv run make sizecheck
   artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
     - core/build/firmware/firmware.bin
     - core/build/bootloader/bootloader.bin
-    - core/build/boardloader/boardloader.bin
     expire_in: 1 week
 
 build core unix:
@@ -49,6 +49,10 @@ build core unix:
   script:
     - cd core
     - pipenv run make build_unix_noui
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
+    untracked: true
+    expire_in: 1 day
 
 # TODO: matrix: DEBUG_LINK={0,1}, gcc vs clang
 build legacy:
@@ -69,23 +73,26 @@ test style:
 
 test core unix unit:
   stage: test
+  dependencies:
+    - build core unix
   script:
     - cd core
-    - pipenv run make build_unix_noui
     - pipenv run make test
 
 test core unix device:
   stage: test
+  dependencies:
+    - build core unix
   script:
     - cd core
-    - pipenv run make build_unix_noui
     - pipenv run make test_emu
 
 test core unix monero:
   stage: test
+  dependencies:
+    - build core unix
   script:
     - cd core
-    - pipenv run make build_unix_noui
     - pipenv run make test_emu_monero
 
 test common: