diff --git a/third_party/remote_config/remote_platform_configure.bzl b/third_party/remote_config/remote_platform_configure.bzl
index dbed2461fbc..386ad603950 100644
--- a/third_party/remote_config/remote_platform_configure.bzl
+++ b/third_party/remote_config/remote_platform_configure.bzl
@@ -18,6 +18,10 @@ def _remote_platform_configure_impl(repository_ctx):
         cpu = "ppc"
     elif machine_type.startswith("s390x"):
         cpu = "s390x"
+    elif machine_type.startswith("aarch64"):
+        cpu = "aarch64"
+    elif machine_type.startswith("arm"):
+        cpu = "arm"
 
     exec_properties = repository_ctx.attr.platform_exec_properties