diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index 8ead36d..a48719f 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -342,7 +342,7 @@
 # buildjdkver is usually same as %%{featurever},
 # but in time of bootstrap of next jdk, it is featurever-1,
 # and this it is better to change it here, on single place
-%global buildjdkver 22
+%global buildjdkver 21
 # We don't add any LTS designator for STS packages (Fedora and EPEL).
 # We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
 %if 0%{?rhel} && !0%{?epel}
@@ -569,7 +569,7 @@ Version: %{newjavaver}.%{buildver}
 # This package needs `.rolling` as part of Release so as to not conflict on install with
 # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
 # java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298
-Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling.0.riscv64%{?dist}
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling.1.riscv64%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
 # and this change was brought into RHEL-4. java-1.5.0-ibm packages
 # also included the epoch in their virtual provides. This created a
@@ -1784,6 +1784,9 @@ done
 %endif
 
 %changelog
+* Wed Mar 13 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1:22.0.0.0.36-3.rolling.1.riscv64
+- Bootstrap using JDK 21
+
 * Tue Mar 12 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1:22.0.0.0.36-3.rolling.0.riscv64
 - Expand riscv64 configuration