diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index a750e20..73813f3 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -145,13 +145,6 @@
 # Architecture on which we run Java only tests
 %global jdk_test_arch x86_64
 
-# Define the OS the portable JDK is built on
-# This is undefined for CentOS & openjdk-portable-rhel-8 builds and
-# equals 'rhel7' for openjdk-portable-rhel-7 builds
-%if 0%{?centos} == 0
-%global pkgos rhel7
-%endif
-
 # By default, we build a debug build during main build on JIT architectures
 %if %{with slowdebug}
 %ifarch %{debug_arches}
@@ -366,7 +359,7 @@
 %global top_level_dir_name   %{vcstag}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
 %global buildver        7
-%global rpmrelease      2
+%global rpmrelease      3
 # Settings used by the portable build
 %global portablerelease 1
 # Portable suffix differs between RHEL and CentOS
@@ -1121,9 +1114,6 @@ exit 0
 %endif
 }
 
-# x86 is not supported by OpenJDK 17
-ExcludeArch: %{ix86}
-
 # not-duplicated requires/provides/obsoletes for normal/debug packages
 %define java_rpo() %{expand:
 Requires: fontconfig%{?_isa}
@@ -1285,6 +1275,16 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
 # Define the root name of the portable packages
 %global pkgnameroot java-%{featurever}-%{origin}-portable%{?pkgos:-%{pkgos}}
 
+# Define the OS the portable JDK is built on
+# This is undefined for CentOS & openjdk-portable-rhel-8 builds and
+# equals 'rhel7' for openjdk-portable-rhel-7 builds
+%if 0%{?centos} == 0
+%global pkgos rhel7
+%endif
+
+# Define the architectures on which we build
+ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64
+
 Name:    java-%{javaver}-%{origin}
 Version: %{newjavaver}.%{buildver}
 Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
@@ -2532,6 +2532,11 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Fri Oct 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.4.0.7-3
+- Sync with RHEL 7 portable build:
+  - Use ExclusiveArch over ExcludeArch
+- Related: RHEL-58797
+
 * Mon Oct 07 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.4.0.7-2
 - Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9')
 - Handle debugedit being a separate package installed in /usr on RHEL/CentOS 10