diff --git a/.github/workflows/build_or_publish.yml b/.github/workflows/build_or_publish.yml
index 0cb97f10c..19cb299f6 100644
--- a/.github/workflows/build_or_publish.yml
+++ b/.github/workflows/build_or_publish.yml
@@ -35,7 +35,7 @@ jobs:
             packages: gcc-multilib
             extra_java: 11
             vendor: zulu
-            args: -Dtarget.java.home="$JAVA_HOME_11_I386"
+            args: -Dtarget.java.home="$JAVA_HOME_11_I386" -Dtarget.arch=i386
           - os: ubuntu-20.04
             arch: amd64
             java_arch: x64
diff --git a/gradle/macosx.gradle b/gradle/macosx.gradle
index b6ffc0df0..7dc4967ea 100644
--- a/gradle/macosx.gradle
+++ b/gradle/macosx.gradle
@@ -144,8 +144,8 @@ tasks.register("macosx_natives_link", Exec) {
     dependsOn "macosx_natives_symbols"
 
     def jdk_lib = "${javavmroot}/Libraries"
-    if (file("${java_home}/lib/libjawt.dylib").exists()) {
-        jdk_lib = "${java_home}/lib"
+    if (file("${javavmroot}/jre/lib/libjawt.dylib").exists()) {
+        jdk_lib = "${javavmroot}/jre/lib"
     }
 
     workingDir(workdirX)