diff --git a/bundleserver/pom.xml b/bundleserver/pom.xml
index df806e5d7c..4673e5a7db 100644
--- a/bundleserver/pom.xml
+++ b/bundleserver/pom.xml
@@ -21,6 +21,30 @@
 		<protobuf.version>3.5.1</protobuf.version>
 		<grpc.version>1.50.2</grpc.version>
 	</properties>
+	<profiles>
+		<profile>
+			<id>mac-m2</id>
+			<activation>
+				<os>
+					<arch>aarch64</arch>
+				</os>
+			</activation>
+			<properties>
+				<custom.os.classifier>osx-x86_64</custom.os.classifier>
+			</properties>
+		</profile>
+		<profile>
+			<id>others</id>
+			<activation>
+				<os>
+					<arch>!aarch64</arch>
+				</os>
+			</activation>
+			<properties>
+				<custom.os.classifier>${os.detected.classifier}</custom.os.classifier>
+			</properties>
+		</profile>
+	</profiles>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -193,10 +217,11 @@
 				<groupId>org.xolstice.maven.plugins</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
 				<version>0.6.1</version>
+				<extensions>true</extensions>
 				<configuration>
-					<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+					<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${custom.os.classifier}</protocArtifact>
 					<pluginId>grpc-java</pluginId>
-					<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
+					<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${custom.os.classifier}</pluginArtifact>
 				</configuration>
 				<executions>
 					<execution>
@@ -209,5 +234,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
 </project>