diff --git a/bob/devtools/data/gitlab-ci/base-build.yaml b/bob/devtools/data/gitlab-ci/base-build.yaml
index a3701b75df386489fbe7b718ec518b928bd126ea..97e652a55e3f02db45007ee57e4329055a4172d3 100644
--- a/bob/devtools/data/gitlab-ci/base-build.yaml
+++ b/bob/devtools/data/gitlab-ci/base-build.yaml
@@ -47,3 +47,13 @@ build_macos_intel:
     - intel
   cache:
     key: "macos-intel-cache"
+
+
+build_macos_arm:
+  extends: .build_template
+  tags:
+    - bob
+    - macos
+    - arm
+  cache:
+    key: "macos-arm-cache"
diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index 13a10e06eb7c4a97d2a88a9541da19d906092ddd..c40ab309c888209d4b62407ca99bffff544bbea3 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -82,6 +82,17 @@ build_macos_intel_39:
   cache:
     key: 'build-py39'
 
+build_macos_arm_39:
+  extends: .build_template
+  variables:
+    PYTHON_VERSION: "3.9"
+  tags:
+    - bob
+    - macos
+    - arm
+  cache:
+    key: 'build-py39'
+
 
 # Periodic cleanup of beta packages
 .cleanup_template:
diff --git a/bob/devtools/data/gitlab-ci/noarch.yaml b/bob/devtools/data/gitlab-ci/noarch.yaml
index 7a54afc842e90fa82844e6072233aee31e333e16..9c8ee0dd2f4c3f6638e9d13234b0111e9cc32eeb 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/bob/devtools/data/gitlab-ci/noarch.yaml
@@ -83,6 +83,18 @@ build_macos_intel:
     - intel
 
 
+build_macos_arm:
+  variables:
+    PYTHON_VERSION: "3.9"
+  cache:
+    key: "build"
+  extends: .build_template
+  tags:
+    - bob
+    - macos
+    - arm
+
+
 # Test targets (not normally used)
 .test_template:
   extends: .bootstrap
@@ -111,6 +123,14 @@ build_macos_intel:
     - intel
 
 
+.test_macos_arm_template:
+  extends: .test_template
+  tags:
+    - bob
+    - macos
+    - arm
+
+
 # Deploy targets
 .deploy_template:
   extends: .bootstrap
@@ -121,6 +141,7 @@ build_macos_intel:
   dependencies:
     - build_linux
     - build_macos_intel
+    - build_macos_arm
   tags:
     - bob
     - docker
@@ -161,6 +182,7 @@ pypi:
   dependencies:
     - build_linux
     - build_macos_intel
+    - build_macos_arm
   tags:
     - bob
     - docker
diff --git a/bob/devtools/data/gitlab-ci/osx-arm64-support.yaml b/bob/devtools/data/gitlab-ci/osx-arm64-support.yaml
deleted file mode 100644
index f2ca8a95115429b151469235ac84b192d3d2c910..0000000000000000000000000000000000000000
--- a/bob/devtools/data/gitlab-ci/osx-arm64-support.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-.build_macos_arm_template:
-  extends: .build_template
-  tags:
-    - macos
-    - arm
-  artifacts:
-    paths:
-      - ${CONDA_ROOT}/conda-bld/osx-arm64/*.conda
-      - ${CONDA_ROOT}/conda-bld/osx-arm64/*.tar.bz2
-
-build_macos_arm_38:
-  extends: .build_macos_arm_template
-  variables:
-    PYTHON_VERSION: "3.8"
-  cache:
-    key: "build-py38"
-
-.deploy_template:
-  dependencies:
-    - build_linux_38
-    - build_macos_intel_38
-    - build_macos_arm_38
-
-deploy_beta:
-  extends: .deploy_template
-  environment: beta
-  only:
-    - master
-
-deploy_stable:
-  extends: .deploy_template
-  environment: stable
-  only:
-    - /^v\d+\.\d+\.\d+([abc]\d*)?$/  # PEP-440 compliant version (tags)
-  except:
-    - branches
-
-pypi:
-  dependencies:
-    - build_linux_38
-    - build_macos_intel_38
-    - build_macos_arm_38
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index 8da3e6b4646529b6cf0c5627bcfd8a0bb2e1ea13..b43dfd3b9ae639a016aa0323b41e1778b8438bc9 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -102,6 +102,7 @@ build_macos_arm_39:
   extends: .build_macos_arm_template
   variables:
     PYTHON_VERSION: "3.9"
+  allow_failure: true
   cache:
     key: "build-py39"
 
@@ -143,7 +144,6 @@ build_linux_39:
     - build_linux_39
     - build_macos_intel_38
     - build_macos_intel_39
-    - build_macos_arm_39
   tags:
     - bob
     - docker
@@ -186,7 +186,6 @@ pypi:
     - build_linux_39
     - build_macos_intel_38
     - build_macos_intel_39
-    - build_macos_arm_39
   tags:
     - bob
     - docker