diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index 83493aa..63459cf 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -1263,7 +1263,11 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
 # Prevent brp-java-repack-jars from being run
 %global __jar_repack 0
 # Define the OS the portable JDK is built on
+# This is undefined for openjdk-portable-rhel-8 builds and
+# equals 'rhel7' for openjdk-portable-rhel-7 builds
+%if 0
 %global pkgos rhel7
+%endif
 # Define the root name of the portable packages
 %global pkgnameroot java-%{featurever}-%{origin}-portable%{?pkgos:-%{pkgos}}
 
@@ -2480,7 +2484,7 @@ require "copy_jdk_configs.lua"
 
 %changelog
 * Fri Apr 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-2
-- rebuilt
+- Disable setting pkgos to rhel7 to revert to the openjdk-portable-rhel-8 version
 - Related: RHEL-30943
 
 * Tue Jan 09 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-1