diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml
index 00e27507e..c448b5dd7 100644
--- a/scripts/nightly.yaml
+++ b/scripts/nightly.yaml
@@ -114,10 +114,19 @@ stages:
     pool:
       vmImage: "ubuntu-latest"
     steps:
-    - script: python scripts/mk_unix_dist.py --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk --arch=arm64
-    - script: git clone https://github.com/z3prover/z3test z3test
-    - script: python z3test/scripts/test_benchmarks.py build-dist/z3 z3test/regressions/smt2    
-    - script: cp dist/*.zip $(Build.ArtifactStagingDirectory)/.
+    - script: curl -L -o /tmp/arm-toolchain.tar.xz 'https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz?rev=33c6e30e5ac64e6dba8f0431f2c35f1b&hash=9918A05BF47621B632C7A5C8D2BB438FB80A4480'
+    - script: mkdir -p /tmp/arm-toolchain/
+    - script: tar xf /tmp/arm-toolchain.tar.xz -C /tmp/arm-toolchain/ --strip-components=1
+    - script: echo '##vso[task.prependpath]/tmp/arm-toolchain/bin'
+    - script: echo '##vso[task.prependpath]/tmp/arm-toolchain/aarch64-none-linux-gnu/libc/usr/bin'
+    - script: echo $PATH
+    - script: stat /tmp/arm-toolchain/bin/aarch64-none-linux-gnu-gcc
+    - script: python scripts/mk_unix_dist.py --nodotnet --nojava --arch=arm64
+    - task: CopyFiles@2
+      inputs:
+        sourceFolder: dist
+        contents: '*.zip'
+        targetFolder: $(Build.ArtifactStagingDirectory)
     - task: PublishPipelineArtifact@0
       inputs:
         artifactName: 'UbuntuArm64'
diff --git a/scripts/release.yml b/scripts/release.yml
index 8f1242f82..3125595d7 100644
--- a/scripts/release.yml
+++ b/scripts/release.yml
@@ -119,10 +119,19 @@ stages:
     pool:
       vmImage: "ubuntu-latest"
     steps:
-    - script: python scripts/mk_unix_dist.py --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk --arch=arm64
-    - script: git clone https://github.com/z3prover/z3test z3test
-    - script: python z3test/scripts/test_benchmarks.py build-dist/z3 z3test/regressions/smt2    
-    - script: cp dist/*.zip $(Build.ArtifactStagingDirectory)/.
+     - script: curl -L -o /tmp/arm-toolchain.tar.xz 'https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz?rev=33c6e30e5ac64e6dba8f0431f2c35f1b&hash=9918A05BF47621B632C7A5C8D2BB438FB80A4480'
+    - script: mkdir -p /tmp/arm-toolchain/
+    - script: tar xf /tmp/arm-toolchain.tar.xz -C /tmp/arm-toolchain/ --strip-components=1
+    - script: echo '##vso[task.prependpath]/tmp/arm-toolchain/bin'
+    - script: echo '##vso[task.prependpath]/tmp/arm-toolchain/aarch64-none-linux-gnu/libc/usr/bin'
+    - script: echo $PATH
+    - script: stat /tmp/arm-toolchain/bin/aarch64-none-linux-gnu-gcc
+    - script: python scripts/mk_unix_dist.py --nodotnet --nojava --arch=arm64
+    - task: CopyFiles@2
+      inputs:
+        sourceFolder: dist
+        contents: '*.zip'
+        targetFolder: $(Build.ArtifactStagingDirectory)
     - task: PublishPipelineArtifact@0
       inputs:
         artifactName: 'UbuntuArm64'