diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d5ff2b7e..f84b3a420 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -127,7 +127,6 @@ jobs:
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 14
           sudo update-alternatives --set gcc /usr/bin/gcc-14
 
-
       - name: Install Nim (pinned)
         uses: iffy/install-nim@v5
         with:
@@ -185,7 +184,15 @@ jobs:
           find . -name ssl_server_full_ec.o -exec file {} \;
 
       - name: Build binaries
-        run: make V=1 QUICK_AND_DIRTY_COMPILER=1 USE_LIBBACKTRACE=0 all
+        run: |
+          NIM_PARAMS=""
+          if [[ '${{ runner.os }}' == 'macOS' ]]; then
+            case "$(uname -m)" in
+              x86_64)  NIM_PARAMS="--cpu:amd64" ;;
+              arm64)   NIM_PARAMS="--cpu:arm64" ;;
+            esac
+          fi
+          make V=1 QUICK_AND_DIRTY_COMPILER=1 NIM_PARAMS="${NIM_PARAMS}" USE_LIBBACKTRACE=0 all
 
   build-windows:
     needs: changes
@@ -273,7 +280,6 @@ jobs:
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 14
           sudo update-alternatives --set gcc /usr/bin/gcc-14
 
-
       - name: Install Nim (pinned)
         uses: iffy/install-nim@v5
         with:
@@ -336,13 +342,19 @@ jobs:
             export NIMFLAGS="--colors:off -d:chronicles_colors:none"
           fi
 
+          NIM_PARAMS=""
+          if [[ '${{ runner.os }}' == 'macOS' ]]; then
+            case "$(uname -m)" in
+              x86_64)  NIM_PARAMS="--cpu:amd64" ;;
+              arm64)   NIM_PARAMS="--cpu:arm64" ;;
+            esac
+          fi
+
           export MAKEFLAGS="-j1"
           export USE_LIBBACKTRACE=0
 
-          make V=1 LOG_LEVEL=DEBUG POSTGRES=$postgres_enabled NIM_PARAMS="-d:BORINGSS_USE_ASM=false" test
-          make V=1 LOG_LEVEL=DEBUG POSTGRES=$postgres_enabled NIM_PARAMS="-d:BORINGSS_USE_ASM=false" testwakunode2
-          make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 POSTGRES=$postgres_enabled test
-          make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 POSTGRES=$postgres_enabled testwakunode2
+          make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 POSTGRES=$postgres_enabled NIM_PARAMS="${NIM_PARAMS}" test
+          make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 POSTGRES=$postgres_enabled NIM_PARAMS="${NIM_PARAMS}" testwakunode2
 
   build-docker-image:
     needs: changes