diff --git a/.drone.jsonnet b/.drone.jsonnet
index c437bfe52..b7b0f8288 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -644,12 +644,12 @@ local FinalPipeline(branch, event) = {
       "failure",
     ],
   } + (if event == "cron" then { cron: ["nightly-" + std.strReplace(branch, ".", "-")] } else {}),
-  depends_on: std.map(function(p) std.join(" ", [branch, p, event, "amd64", "10.6-enterprise", "", ""]), platforms[current_branch]),
+  depends_on: std.map(function(p) std.join(" ", [branch, p, event, "arm64", "10.6-enterprise", "", ""]), platforms[current_branch]),
   // +std.map(function(p) std.join(" ", [branch, p, event, "arm64", "10.6-enterprise", "", ""]), platforms_arm.develop),
 };
 
 [
-  Pipeline(b, p, e, "amd64", s)
+  Pipeline(b, p, e, "arm64", s)
   for b in std.objectFields(platforms)
   for p in platforms[b]
   for s in servers[b]
diff --git a/build/build_cmapi.sh b/build/build_cmapi.sh
index 84c6ca5b0..da0e64d94 100755
--- a/build/build_cmapi.sh
+++ b/build/build_cmapi.sh
@@ -28,7 +28,7 @@ fi
 
 select_pkg_format ${OS}
 
-if [[ "$(arch)" == "arm64" ]]; then
+if [[ "$(arch)" == "arm64" || "$(arch)" == "aarch64" ]]; then
   export CC=gcc
 fi
 
@@ -59,7 +59,7 @@ install_deps() {
 
   if [ "$(arch)" == "x86_64" ]; then
     PYTHON_URL="https://github.com/indygreg/python-build-standalone/releases/download/20220802/cpython-3.9.13+20220802-x86_64_v2-unknown-linux-gnu-pgo+lto-full.tar.zst"
-  elif [ "$(arch)" == "arm64" ]; then
+  elif [[ "$(arch)" == "arm64" || "$(arch)" == "aarch64" ]]; then
     PYTHON_URL="https://github.com/indygreg/python-build-standalone/releases/download/20220802/cpython-3.9.13+20220802-aarch64-unknown-linux-gnu-noopt-full.tar.zst"
   else
     echo "Unsupported architecture: $(arch)"