diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index 5ed9847..8e677b8 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -420,7 +420,7 @@
 # we can copy the javadoc to not arched dir, or make it not noarch
 %define uniquejavadocdir() %{expand:%{name}%{?1}}
 # main id and dir of this jdk
-%define uniquesuffix()        %{expand:%{fullversion}.%{_arch}%{?1}}
+%define uniquesuffix() %{expand:%{name}%{?1}}
 
 #################################################################
 # fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
@@ -961,7 +961,6 @@ fi
 %ghost %{_bindir}/serialver
 %ghost %{_jvmdir}/java-%{origin}
 %ghost %{_jvmdir}/java-%{javaver}
-%ghost %{_jvmdir}/java-%{javaver}-%{origin}
 %endif
 %endif
 }
@@ -2374,6 +2373,7 @@ done
 - Move alternatives installation from posttrans to post
 - Replace jrelnk alternative with sdkdir
 - Remove full version from uniquejavadocdir
+- Remove full version from uniquesuffix
 
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:21.0.5.0.11-2.1
 - Bump release for October 2024 mass rebuild: