diff --git a/ci/build.yml b/ci/build.yml
index e898ba15f6..ee2bebe4d9 100644
--- a/ci/build.yml
+++ b/ci/build.yml
@@ -133,37 +133,35 @@ core fw btconly production build:
       - trezor-fw-btconly-production-*.*.*-$CI_COMMIT_SHORT_SHA.bin
     expire_in: 1 week
 
-core fw R btconly debug build:
+core fw R debug build:
   stage: build
   <<: *gitlab_caching
   needs: []
   variables:
     TREZOR_MODEL: "R"
-    BITCOIN_ONLY: "1"
     PYOPT: "0"
   script:
     - nix-shell --run "poetry run make -C core build_firmware"
-    - cp core/build/firmware/firmware.bin trezor-fw-btconly-debug-tr-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
+    - cp core/build/firmware/firmware.bin trezor-fw-debug-tr-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
-      - trezor-fw-btconly-*.*.*-$CI_COMMIT_SHORT_SHA.bin
+      - trezor-fw-*.*.*-$CI_COMMIT_SHORT_SHA.bin
     expire_in: 1 week
 
-core fw R btconly build:
+core fw R build:
   stage: build
   <<: *gitlab_caching
   needs: []
   variables:
     TREZOR_MODEL: "R"
-    BITCOIN_ONLY: "1"
   script:
     - nix-shell --run "poetry run make -C core build_firmware"
-    - cp core/build/firmware/firmware.bin trezor-fw-btconly-tr-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
+    - cp core/build/firmware/firmware.bin trezor-fw-tr-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
-      - trezor-fw-btconly-*.*.*-$CI_COMMIT_SHORT_SHA.bin
+      - trezor-fw-*.*.*-$CI_COMMIT_SHORT_SHA.bin
     expire_in: 1 week
 
 # Non-frozen emulator build. This means you still need Python files