diff --git a/aarch32.tar.xz b/aarch32.tar.xz
index 3f5c8f4..9bac412 100644
--- a/aarch32.tar.xz
+++ b/aarch32.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb42672c3a8be06b0420d6d9aae30ca4ede08cf8890f9ce2fd8663543d4c4ea3
-size 7204404
+oid sha256:ee670f481885dd512714af1caed93473b51dab8934b9b71f80d7f0d7adc02313
+size 7207712
diff --git a/corba.tar.xz b/corba.tar.xz
index a9165d5..c8de922 100644
--- a/corba.tar.xz
+++ b/corba.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27f033b79e780258f399cef7273cd7bdc14dd5d1057b1d02d2f9f6a638d73f18
-size 949188
+oid sha256:ab0bff4445822c5e5741088da0e83a9bc20d059b8a95fcffd5885c03969bbeeb
+size 949700
diff --git a/hotspot.tar.xz b/hotspot.tar.xz
index 8fa7265..539afc9 100644
--- a/hotspot.tar.xz
+++ b/hotspot.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf8a1df57816e5494ae75bcd19cbaf78d580091f2b37064766e7607ae053714d
-size 7116972
+oid sha256:4231a4b534b1c44aaf5e0b51833f0e40f0654dcaa41c6259cf65037eccd427ae
+size 7121192
diff --git a/icedtea-3.20.0.tar.xz b/icedtea-3.20.0.tar.xz
deleted file mode 100644
index 36871a3..0000000
--- a/icedtea-3.20.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2eff74514fb1dcc18521c4c13d156933e179b7f06e7b524c8c5b56a6a8048248
-size 1571424
diff --git a/icedtea-3.21.0.tar.xz b/icedtea-3.21.0.tar.xz
new file mode 100644
index 0000000..9a9cb82
--- /dev/null
+++ b/icedtea-3.21.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f83ee85d39f39a304dbd6c79aaeb4fa04257fc2e61031d0a28587a1953ba2459
+size 1574548
diff --git a/icedtea-sound-1.0.1.tar.xz b/icedtea-sound-1.0.1.tar.xz
deleted file mode 100644
index 8854fbc..0000000
--- a/icedtea-sound-1.0.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ff852b82ae7db7a95981271037eb3a3d52c59581e3b27a638a7c6bc8eecb4a3
-size 1515308
diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 9eb7910..29b06ef 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov  2 13:13:44 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version jdk8u312 (icedtea-3.21.0)
+  * October 2021 CPU
+
+
 -------------------------------------------------------------------
 Wed Oct 13 10:38:53 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 7157c9a..123b04e 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -19,7 +19,7 @@
 %{!?make_build:%global make_build make %{?_smp_mflags}}
 %{!?aarch64:%global aarch64 aarch64 arm64 armv8}
 %global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64} %{arm}
-%global icedtea_version 3.20.0
+%global icedtea_version 3.21.0
 %global buildoutputdir openjdk.build/
 # Convert an absolute path to a relative path.  Each symbolic link is
 # specified relative to the directory in which it is installed so that
@@ -32,8 +32,8 @@
 # priority must be 6 digits in total
 %global priority        1805
 %global javaver         1.8.0
-%global updatever       302
-%global buildver        08
+%global updatever       312
+%global buildver        07
 # Standard JPackage directories and symbolic links.
 %global sdklnk          java-%{javaver}-openjdk
 %global archname        %{sdklnk}
diff --git a/jaxp.tar.xz b/jaxp.tar.xz
index ce189d3..75c8e0e 100644
--- a/jaxp.tar.xz
+++ b/jaxp.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6aee0d09c762beb819582dd55ac3585291b69c77b422e53f89ee9223527b6494
-size 2268628
+oid sha256:c5bb8b86a8d24ca7abde8f6cf15dec18c6e9a5201e4942a7ef117b28c960f54f
+size 2269276
diff --git a/jaxws.tar.xz b/jaxws.tar.xz
index f9e215e..93ce233 100644
--- a/jaxws.tar.xz
+++ b/jaxws.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b154009f308823b42189a4cd4648887b63c3203348e8028ae5e7b85d520dc0d8
-size 2277776
+oid sha256:6a1244d4b8c0f78d34e44edb92a96cb127ec4b43847a6d5a176c37f392499993
+size 2278396
diff --git a/jdk.tar.xz b/jdk.tar.xz
index 6e150f6..1f3f7bb 100644
--- a/jdk.tar.xz
+++ b/jdk.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:295c538f800e10fe4bc57afbdb6880bed5b8bf87748027ece7911acedf1676ad
-size 40701016
+oid sha256:eab27c3ad455b68b29fec2f59730d48c97f53699000da21a5e1640b825840385
+size 40714380
diff --git a/langtools.tar.xz b/langtools.tar.xz
index f5b098f..eba2fb7 100644
--- a/langtools.tar.xz
+++ b/langtools.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:622009a5a1d6df05dfe30ca8f6af05a066a42dbdbeb7e9e75db0c46ee62e2092
-size 2080812
+oid sha256:499c749aa8dbe120bde899d0712d47e3cebc7d4a0a4b4c9b6afb2b0bdda98b82
+size 2081452
diff --git a/nashorn.tar.xz b/nashorn.tar.xz
index 2b89def..7a51e85 100644
--- a/nashorn.tar.xz
+++ b/nashorn.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1bfac52db825843493c0c3df2f2a38f5b93d1c9c9a7281d8f94c61491afcac38
-size 2322088
+oid sha256:495276d1e1e6b3a5a0d257c21b2e6349b000ac083be209a47a01b45894a65d59
+size 2324264
diff --git a/openjdk.tar.xz b/openjdk.tar.xz
index f52f51c..8efd4a4 100644
--- a/openjdk.tar.xz
+++ b/openjdk.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2aed6bc383d574bb829db97504fa64044e70b1ab6f47605fa025fad47e2ecd21
-size 366092
+oid sha256:ea3fe2097a0ce02e6781e8a0cc1b923ab52803a527cc34ef686779c04a3e1c21
+size 367068
diff --git a/shenandoah.tar.xz b/shenandoah.tar.xz
index ea098f4..2e5daf1 100644
--- a/shenandoah.tar.xz
+++ b/shenandoah.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef3c9ee9cb36cd893a1fac176ede1e18dc6894bee6b3025846cf7ee5a5e4b6b5
-size 7290168
+oid sha256:635da162c98b27d370da21a5544d948b2cbb3dfba5b14433c1c1f51f9ab49793
+size 7295776