diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74e9697b2ee..17dfe4a6b3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -282,7 +282,7 @@ endif()
 include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external)
 
 if(APPLE)
-  include_directories(SYSTEM /usr/include/malloc)
+  include_directories(SYSTEM /usr/include/malloc /opt/homebrew/include)
   if(POLICY CMP0042)
     cmake_policy(SET CMP0042 NEW)
   endif()
diff --git a/Makefile b/Makefile
index a1f6faa2777..a1f6168b0f3 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ release-all:
 
 release-static:
 	mkdir -p $(builddir)/release
-	cd $(builddir)/release && cmake -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release $(topdir) && $(MAKE)
+	cd $(builddir)/release && cmake -D STATIC=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release $(topdir) && $(MAKE)
 
 coverage:
 	mkdir -p $(builddir)/debug
diff --git a/codemagic.yaml b/codemagic.yaml
new file mode 100644
index 00000000000..849e4c11b4a
--- /dev/null
+++ b/codemagic.yaml
@@ -0,0 +1,46 @@
+workflows:
+  build:
+    name: Build workflow
+    triggering:
+      events:
+        - tag
+      branch_patterns:
+        - pattern: '*'
+          include: true
+          source: true
+    environment:
+      groups:
+        - github
+    scripts:
+      - name: install dependencies
+        script: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost openssl zmq libpgm miniupnpc ldns expat libunwind-headers protobuf
+      - name: fetch zmq.hpp
+        script: brew tap osrf/simulation && brew install cppzmq
+      - name: build
+        script: USE_SINGLE_BUILDDIR=1 make release-static -j3
+      - name: archive
+        working_directory: build/release
+        script: |
+          export ARTIFACT_NAME="aeon-mac-armv8-$(git describe --tags)"
+          mkdir $ARTIFACT_NAME
+          cp bin/* $ARTIFACT_NAME
+          tar cvzf $ARTIFACT_NAME.tar.bz2 $ARTIFACT_NAME
+      - name: SHA256 checksum
+        working_directory: build/release
+        script: |
+          export ARTIFACT_NAME="aeon-mac-armv8-$(git describe --tags)"
+          openssl sha256 $ARTIFACT_NAME.tar.bz2
+      - name: upload to transfer.sh
+        script: |
+          export ARTIFACT_NAME="aeon-mac-armv8-$(git describe --tags)"
+          curl --upload-file build/release/$ARTIFACT_NAME.tar.bz2 https://transfer.sh/$ARTIFACT_NAME.tar.bz2
+      - name: Publish to GitHub
+        script: |
+          #!/usr/bin/env zsh
+          # Publish only for tag builds
+          if [ -z ${CM_TAG} ]; then
+            echo "Not a tag build, will not publish GitHub release"
+            exit 0
+          fi
+          export ARTIFACT_NAME="aeon-mac-armv8-$(git describe --tags)"
+          gh release upload "${CM_TAG}" build/release/$ARTIFACT_NAME.tar.bz2
diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
index 8732d9847b1..eae05659f17 100644
--- a/src/crypto/CMakeLists.txt
+++ b/src/crypto/CMakeLists.txt
@@ -105,4 +105,10 @@ if (ANDROID OR IOS)
   endif()
 endif()
 
+# M1 Mac seems to behave oddly
+if (APPLE AND ARM)
+  add_definitions(-DNO_AES)
+  add_definitions(-DFORCE_USE_HEAP)
+endif()
+