diff --git a/taskcluster/ci/server-megazord-build/kind.yml b/taskcluster/ci/server-megazord-build/kind.yml
index 3a13049523..6ed9093c1e 100644
--- a/taskcluster/ci/server-megazord-build/kind.yml
+++ b/taskcluster/ci/server-megazord-build/kind.yml
@@ -28,15 +28,15 @@ tasks:
       megazord: nimbus-experimenter
       target: x86_64-unknown-linux-gnu
 
-  nimbus-experimenter-linux-x86_64-musl:
-    attributes:
-      megazord: nimbus-experimenter
-      target: x86_64-unknown-linux-musl
-
-  # nimbus-experimenter-linux-aarch64-gnu:
+  # nimbus-experimenter-linux-x86_64-musl:
   #   attributes:
   #     megazord: nimbus-experimenter
-  #     target: aarch64-unknown-linux-gnu
+  #     target: x86_64-unknown-linux-musl
+
+  nimbus-experimenter-linux-aarch64-gnu:
+    attributes:
+      megazord: nimbus-experimenter
+      target: aarch64-unknown-linux-gnu
 
   # nimbus-experimenter-linux-aarch64-musl:
   #   attributes:
@@ -53,7 +53,7 @@ tasks:
       megazord: cirrus
       target: x86_64-unknown-linux-gnu
 
-  # cirrus-linux-aarch64:
-  #   attributes:
-  #     megazord: cirrus
-  #     target: aarch64-unknown-linux-gnu
+  cirrus-linux-aarch64-gnu:
+    attributes:
+      megazord: cirrus
+      target: aarch64-unknown-linux-gnu