diff --git a/Dockerfile b/Dockerfile
index 8ea49aa..3ff8630 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,6 +18,7 @@ ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION
 
 COPY ext/libraries/libsignal-client/v${LIBSIGNAL_CLIENT_VERSION} /tmp/libsignal-client-libraries
 COPY ext/libraries/libsignal-client/signal-cli-native.patch /tmp/signal-cli-native.patch
+COPY ext/patches/signal-cli-native-arch.patch /tmp/signal-cli-native-arch.patch
 
 # use architecture specific libsignal_jni.so
 RUN arch="$(uname -m)"; \
@@ -83,6 +84,7 @@ RUN if [ "$(uname -m)" = "x86_64" ]; then \
 		&& zip -qu libsignal-client.jar libsignal_jni.so \
 		&& cd /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source \
 		&& git apply /tmp/signal-cli-native.patch \
+		&& git apply /tmp/signal-cli-native-arch.patch \
 		&& ./gradlew -q nativeCompile; \
 	elif [ "$(uname -m)" = "aarch64" ] ; then \
 		echo "Use native image from @morph027 (https://packaging.gitlab.io/signal-cli/) for arm64 - many thanks to @morph027" \
diff --git a/ext/patches/signal-cli-native-arch.patch b/ext/patches/signal-cli-native-arch.patch
new file mode 100644
index 0000000..e2999f8
--- /dev/null
+++ b/ext/patches/signal-cli-native-arch.patch
@@ -0,0 +1,12 @@
+diff --git a/build.gradle.kts b/build.gradle.kts
+index f7a3737b..ffa0a1e7 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -27,6 +27,7 @@ graalvmNative {
+             buildArgs.add("--install-exit-handlers")
+             buildArgs.add("-Dfile.encoding=UTF-8")
+             buildArgs.add("-J-Dfile.encoding=UTF-8")
++            buildArgs.add("-march=compatibility")
+             resources.autodetect()
+             configurationFileDirectories.from(file("graalvm-config-dir"))
+             if (System.getenv("GRAALVM_HOME") == null) {