diff --git a/compiler/build.gradle b/compiler/build.gradle
index 60d3a436f..409df7a03 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -31,6 +31,7 @@ def addLibraryIfNotLinked = { libName, argList ->
 }
 
 def String arch = rootProject.hasProperty('targetArch') ? rootProject.targetArch : osdetector.arch
+// arch = arch.replace('osx_arm-v8', 'osx_aarch64')
 def boolean vcDisable = rootProject.hasProperty('vcDisable') ? rootProject.vcDisable : false
 def boolean usingVisualCpp // Whether VisualCpp is actually available and selected
 
@@ -56,8 +57,10 @@ model {
                 linker.executable = 'aarch64-linux-gnu-g++'
             }
             target("s390_64")
+            target("osx_aarch64")
         }
         clang(Clang) {
+            target("osx_arm-v8")
         }
     }
 
@@ -67,6 +70,8 @@ model {
         ppcle_64 { architecture "ppcle_64" }
         aarch_64 { architecture "aarch_64" }
         s390_64 { architecture "s390_64" }
+        osx_aarch64 { architecture "osx_aarch64" }
+        'osx_arm-v8' { architecture "osx_aarch64" }
     }
 
     components {
@@ -76,11 +81,14 @@ model {
                 'x86_64',
                 'ppcle_64',
                 'aarch_64',
-                's390_64'
+                's390_64',
+                'osx_aarch64'
             ]) {
                 // If arch is not within the defined platforms, we do not specify the
                 // targetPlatform so that Gradle will choose what is appropriate.
                 targetPlatform arch
+            } else if (arch in [ 'osx_arm-v8' ]) {
+                targetPlatform 'osx_aarch64'
             }
             baseName "$protocPluginBaseName"
         }
diff --git a/compiler/check-artifact.sh b/compiler/check-artifact.sh
index 13ae89c74..341709d17 100755
--- a/compiler/check-artifact.sh
+++ b/compiler/check-artifact.sh
@@ -81,6 +81,8 @@ checkArch ()
       assertEq "$format" "i386" $LINENO
     elif [[ "$ARCH" == x86_64 ]]; then
       assertEq "$format" "x86_64" $LINENO
+    elif [[ "$ARCH" == arm64 ]]; then
+      assertEq "$format" "arm64" $LINENO
     else
       fail "Unsupported arch: $ARCH"
     fi
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bb8b2fc26..ffed3a254 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists