diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04e4a6973..e25d33b49 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ stages:
   - deploy
 
 before_script:
-  - . $HOME/.nix-profile/etc/profile.d/nix.sh || true
+  - . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
   - nix-shell --run "poetry install"
   - export LEGACY_VERSION=$(nix-shell --run "./tools/version.sh legacy/firmware/version.h")
   - export CORE_VERSION=$(nix-shell --run "./tools/version.sh core/embed/firmware/version.h")
diff --git a/ci/build.yml b/ci/build.yml
index d2d7c958d..a77da3ee6 100644
--- a/ci/build.yml
+++ b/ci/build.yml
@@ -153,6 +153,27 @@ core unix frozen debug build:
     untracked: true
     expire_in: 1 week
 
+core unix frozen debug build arm:
+  image: vdovhanych/nixos
+  stage: build
+  <<: *gitlab_caching
+  needs: []
+  only:
+    - master
+    - /^release\//
+    - /^secfix\//
+  variables:
+    PYOPT: "0"
+  script:
+    - nix-shell --run "poetry run make -C core build_unix_frozen"
+    - mv core/build/unix/trezor-emu-core core/build/unix/trezor-emu-core-arm
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
+    untracked: true
+    expire_in: 1 week
+  tags:
+    - docker_darwin_arm
+
 core unix frozen btconly debug t1 build:
   stage: build
   needs: []
@@ -174,9 +195,9 @@ core macos frozen regular build:
   needs: []
   when: manual
   tags:
-    - darwin
+    - darwin_arm
   script:
-    - nix-shell --run "poetry run make -C core build_unix_frozen"
+    - nix-shell --option system x86_64-darwin --run "poetry run make -C core build_unix_frozen"
     - export NAME="trezor-emu-core.darwin"
     - cp -v core/build/unix/trezor-emu-core ./$NAME
     - chmod +x $NAME
@@ -301,6 +322,29 @@ legacy emu regular debug build:
       - legacy/firmware/trezor.elf
     expire_in: 1 week
 
+legacy emu regular debug build arm:
+  image: vdovhanych/nixos
+  stage: build
+  <<: *gitlab_caching
+  needs: []
+  only:
+    - master
+    - /^release\//
+    - /^secfix\//
+  variables:
+    DEBUG_LINK: "1"
+    EMULATOR: "1"
+  script:
+    - nix-shell --run "poetry run legacy/script/cibuild"
+    - mv legacy/firmware/trezor.elf  legacy/firmware/trezor-arm.elf
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
+    paths:
+      - legacy/firmware/trezor-arm.elf
+    expire_in: 1 week
+  tags:
+    - docker_darwin_arm
+
 legacy emu btconly debug build:
   stage: build
   <<: *gitlab_caching