diff --git a/.gitignore b/.gitignore
index 312e85f..29ee5dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,2 @@
-/jdk-jdk12-jdk-12+33.tar.xz
 /systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
-/jdk-updates-jdk12u-jdk-12.0.1+12.tar.xz
-/jdk-jdk13-jdk-13+27.tar.xz
-/jdk-jdk13-jdk-13+28.tar.xz
-/jdk-jdk13-jdk-13+33.tar.xz
-/jdk-updates-jdk13u-jdk-13.0.1+9.tar.xz
-/jdk-updates-jdk13u-jdk-13.0.2+8.tar.xz
-/jdk-jdk14-jdk-14+36.tar.xz
-/jdk-updates-jdk14u-jdk-14.0.1+7.tar.xz
-/jdk-updates-jdk14u-jdk-14.0.2+12.tar.xz
-/jdk-jdk15-jdk-15+36.tar.xz
-/jdk-updates-jdk15u-jdk-15.0.1+9.tar.xz
-/tapsets-icedtea-3.15.0.tar.xz
-/jdk-updates-jdk15u-jdk-15.0.2+7.tar.xz
-/openjdk-jdk16-jdk-16+36.tar.xz
-/openjdk-jdk16u-jdk-16.0.1+9.tar.xz
-/openjdk-jdk17-jdk-17+26.tar.xz
-/openjdk-jdk17-jdk-17+33.tar.xz
-/openjdk-jdk17-jdk-17+35.tar.xz
-/openjdk-jdk17u-jdk-17.0.1+12.tar.xz
 /tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
-/openjdk-jdk17u-jdk-17.0.2+8.tar.xz
-/openjdk-jdk-jdk-18+27.tar.xz
-/openjdk-jdk18-jdk-18+27.tar.xz
-/openjdk-jdk18-jdk-18+37.tar.xz
-/openjdk-jdk18u-jdk-18.0.1+0.tar.xz
-/openjdk-jdk18u-jdk-18.0.1+10.tar.xz
-/openjdk-jdk18u-jdk-18.0.1.1+2.tar.xz
-/openjdk-jdk18u-jdk-18.0.2+9.tar.xz
-/openjdk-jdk19u-jdk-19+36.tar.xz
-/openjdk-jdk19u-jdk-19.0.1+10.tar.xz
-/openjdk-jdk19u-jdk-19.0.2+7.tar.xz
diff --git a/README.md b/README.md
index a1b7ef9..0277869 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,13 @@
 Rolling release of (usually) STSs  OpenJDK
-OpenJDK has release cadence of 6 months, but 3/4 of them are Short Term Supported for 6 months only. This package is designed to harbor them. Currently it is build of OpenJDK 12. LTSs will go also as separate packages. 
+OpenJDK has release cadence of 6 months, but 3/4 of them are Short Term Supported for 6 months only. This package is designed to harbor them. Currently it is build of OpenJDK 21. LTSs will go also as separate packages. 
 
-JDK12 is current release of Java platform. It is bringing many cool improvements - https://openjdk.java.net/projects/jdk/12/ and is landing to your Fedora. Where it will be maintained for f28 and newer. Unluckily, this package is STS (short term support) version. Between individual LTS there will be always several STS. Again, please see announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html and See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf . So this is rolling release of all STSs to come. Its fate during the release of fresh LTS is yet to be decided. You will always be allowed to install LTS in fedora build root, alongside with latest STS via alternatives. 
+JDK21 is current release of Java platform. It is bringing many cool improvements - https://openjdk.java.net/projects/jdk/12/ and is landing to your Fedora. Where it will be maintained for f28 and newer. Unluckily, this package is STS (short term support) version. Between individual LTS there will be always several STS. Again, please see announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html and See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf . So this is rolling release of all STSs to come. Its fate during the release of fresh LTS is yet to be decided. You will always be allowed to install LTS in fedora build root, alongside with latest STS via alternatives. 
 
 
 See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html
 See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf
 
-https://bugzilla.redhat.com/show_bug.cgi?id=1557371#c0
-https://fedoraproject.org/wiki/Changes/java-openjdk-10
-https://fedoraproject.org/wiki/Changes/java-11-openjdk-TechPreview
+* 18: https://openjdk.java.net/projects/jdk/18
+* 19: https://openjdk.java.net/projects/jdk/19
+* 20: https://openjdk.java.net/projects/jdk/20
+* 21: https://openjdk.java.net/projects/jdk/21
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index ccf69da..1663e1e 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -2081,7 +2081,7 @@ export JAVA_HOME=${RPM_BUILD_ROOT}%{_jvmdir}/%{sdkdir -- $suffix}
 
 #check Shenandoah is enabled
 %if %{use_shenandoah_hotspot}
-$JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -version
+$JAVA_HOME/bin/java -XX:+UseShenandoahGC -version
 %endif
 
 # Check unlimited policy has been used