diff --git a/build.sbt b/build.sbt
index 17f737f1f..0c952bb1f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -62,7 +62,9 @@ ThisBuild / scalacOptions ++= Seq(
   // "-explain",
   // "-Xfatal-warnings",
   // "-Wconf:cat=deprecation:w,any:e",
-  "-language:implicitConversions"
+  "-language:implicitConversions",
+  "-old-syntax",
+  "-no-indent"
 )
 
 ThisBuild / javacOptions ++= Seq(
diff --git a/proto-bindings/build.sbt b/proto-bindings/build.sbt
index d681e914b..9740f2d36 100644
--- a/proto-bindings/build.sbt
+++ b/proto-bindings/build.sbt
@@ -6,7 +6,7 @@ enablePlugins(ProtobufPlugin)
 val protocLocalDir   = "protoc"
 val protocBinaryPath = s"$protocLocalDir/bin/protoc"
 ProtobufConfig / protobufProtoc := protocBinaryPath
-ProtobufConfig / version        := "3.18.0"
+ProtobufConfig / version        := "3.20.1"
 ProtobufConfig / sourceDirectories += (ProtobufConfig / protobufExternalIncludePath).value
 ProtobufConfig / protobufGenerate := (ProtobufConfig / protobufGenerate)
   .dependsOn(copyLatestCpgProto)
@@ -35,7 +35,9 @@ installProtoc := {
   if (!isAlreadyInstalled) {
     val platform = (System.getProperty("os.name"), System.getProperty("os.arch")) match {
       case ("Linux", "amd64")                                                      => "linux-x86_64"
+      case ("Linux", "aarch64")                                                    => "linux-aarch_64"
       case (name, "amd64") if name.startsWith("Windows")                           => "win64"
+      case ("Mac OS X", "aarch64")                                                 => "osx-aarch_64"
       case (name, arch) if name.toLowerCase.contains("mac") && arch.contains("64") => "osx-x86_64"
       case (name, arch) =>
         throw new AssertionError(