diff --git a/java-25-openjdk.spec b/java-25-openjdk.spec
index a569d98..bbea039 100644
--- a/java-25-openjdk.spec
+++ b/java-25-openjdk.spec
@@ -387,6 +387,14 @@
 %endif
 %global portablebuilddir /builddir/build/BUILD
 
+%if 0%{?almalinux}
+%ifarch riscv64
+%global portablesuffix el10
+%else
+%global portablesuffix el8
+%endif
+%endif              
+
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -1192,7 +1200,7 @@ ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 riscv64
 
 Name:    java-%{javaver}-%{origin}
 Version: %{newjavaver}.%{buildver}
-Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.alma.1
 # Equivalent for the portable build
 %global prelease %{?eaprefix}%{portablerelease}%{?extraver}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
@@ -1337,7 +1345,6 @@ Source30: 0008-Tools.gmk-Use-update-repository-on-RHEL-rather-than-.patch
 # test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java: fixed jtreg main class
 # RH1940064: Enable XML Signature provider in FIPS mode
 # RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized [now part of JDK-8301553 upstream]
-# Disabled until 25: Patch1001: fips-%{featurever}u-%{fipsver}.patch
 
 #############################################
 #
@@ -1814,16 +1821,16 @@ sh %{SOURCE12} %{top_level_dir_name}
 
 # Patch the JDK
 # This syntax is deprecated:
-#    %patchN [...]
+#    %%patchN [...]
 # and should be replaced with:
-#    %patch -PN [...]
+#    %%patch -PN [...]
 # For example:
-#    %patch1001 -p1
+#    %%patch1001 -p1
 # becomes:
-#    %patch -P1001 -p1
+#    %%patch -P1001 -p1
 # The replacement format suggested by recent (circa Fedora 38) RPM
 # deprecation messages:
-#    %patch N [...]
+#    %%patch N [...]
 # is not backward-compatible with prior (circa RHEL-8) versions of
 # rpmbuild.
 pushd %{top_level_dir_name}
@@ -2478,6 +2485,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Oct 13 2025 Eduard Abdullin <eabdullin@almalinux.org> - 1:22.0.2.0.9-1.alma.1
+- Use el8 portable packages
+
 * Tue Sep 23 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:22.0.2.0.9-1
 - Update to jdk-22.0.2+9 (GA)
 - Update release notes with features of JDK 22