diff --git a/.gitignore b/.gitignore
index 1a13c4c..42c84a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -253,3 +253,4 @@
 /openjdk-shenandoah-jdk8u-aarch64-shenandoah-jdk8u322-b05-4curve.tar.xz
 /openjdk-shenandoah-jdk8u-aarch64-shenandoah-jdk8u322-b06-4curve.tar.xz
 /openjdk-shenandoah-jdk8u-shenandoah-jdk8u332-b01-4curve.tar.xz
+/openjdk-shenandoah-jdk8u-shenandoah-jdk8u332-b06-4curve.tar.xz
diff --git a/NEWS b/NEWS
index 8c34c43..6baf506 100644
--- a/NEWS
+++ b/NEWS
@@ -13,11 +13,16 @@ Live versions of these release notes can be found at:
   - JDK-8033980: Xerces Update: datatype XMLGregorianCalendarImpl and DurationImpl
   - JDK-8035437: Xerces Update: xml/serialize/DOMSerializerImpl
   - JDK-8035577: Xerces Update: impl/xpath/regex/RangeToken.java
+  - JDK-8037259: xerces update: xpointer update
+  - JDK-8041523: Xerces Update: Serializer improvements from Xalan
+  - JDK-8141508: java.lang.invoke.LambdaConversionException: Invalid receiver type
   - JDK-8162572: Update License Header for all JAXP sources
   - JDK-8167014: jdeps: Missing message: warn.skipped.entry
   - JDK-8198411: [TEST_BUG] Two java2d tests are unstable in mach5
   - JDK-8202822: Add .git to .hgignore
   - JDK-8205540: test/hotspot/jtreg/vmTestbase/nsk/jdb/trace/trace001/trace001.java fails with Debuggee did not exit after 15 <cont> commands
+  - JDK-8209178: Proxied HttpsURLConnection doesn't send BODY when retrying POST request
+  - JDK-8210283: Support git as an SCM alternative in the build
   - JDK-8218682: [TEST_BUG] DashOffset fails in mach5
   - JDK-8225690: Multiple AttachListener threads can be created
   - JDK-8227738: jvmti/DataDumpRequest/datadumpreq001 failed due to "exit code is 134"
@@ -27,10 +32,17 @@ Live versions of these release notes can be found at:
   - JDK-8247766: [aarch64] guarantee(val < (1U << nbits)) failed: Field too big for insn
   - JDK-8253147: The javax/swing/JPopupMenu/7154841/bug7154841.java fail on big screens
   - JDK-8253353: Crash in C2: guarantee(n != NULL) failed: No Node
+  - JDK-8260632: Build failures after JDK-8253353
   - JDK-8266749: AArch64: Backtracing broken on PAC enabled systems
   - JDK-8270290: NTLM authentication fails if HEAD request is used
+  - JDK-8273229: Update OS detection code to recognize Windows Server 2022
+  - JDK-8273341: Update Siphash to version 1.0
+  - JDK-8273575: memory leak in appendBootClassPath(), paths must be deallocated
+  - JDK-8274524: SSLSocket.close() hangs if it is called during the ssl handshake
   - JDK-8277224: sun.security.pkcs.PKCS9Attributes.toString() throws NPE
+  - JDK-8277488: Add expiry exception for Digicert (geotrustglobalca) expiring in May 2022
   - JDK-8279077: JFR crashes on Linux ppc due to missing crash protector in signal handler
+  - JDK-8280060: The sun/rmi/server/Activation.java class use Thread.dumpStack()
 * Shenandoah
   - JDK-8282458: Update .jcheck/conf file for sh-jdk8u move to git
 
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index d296391..c00f352 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -309,7 +309,7 @@
 # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
 %global shenandoah_project	openjdk
 %global shenandoah_repo		shenandoah-jdk8u
-%global shenandoah_revision    	shenandoah-jdk8u332-b01
+%global shenandoah_revision    	shenandoah-jdk8u332-b06
 # Define old aarch64/jdk8u tree variables for compatibility
 %global project         %{shenandoah_project}
 %global repo            %{shenandoah_repo}
@@ -2658,9 +2658,14 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Mon Apr 18 2022 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.332.b06-0.1.ea
+- Update to shenandoah-jdk8u332-b06 (EA)
+- Update release notes for shenandoah-8u332-b06.
+- Resolves: rhbz#2050457
+
 * Sun Apr 17 2022 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.332.b01-0.1.ea
 - Update to shenandoah-jdk8u332-b01 (EA)
-- Update release notes for 8u332-b01.
+- Update release notes for shenandoah-8u332-b01.
 - Switch to EA mode.
 - Related: rhbz#2050457
 
diff --git a/sources b/sources
index 71b554d..8c3d3bb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (openjdk-shenandoah-jdk8u-shenandoah-jdk8u332-b01-4curve.tar.xz) = 55b8968e78631acdf14a594d83f6e357e00114dac9f6330a80116a909b402a9f879abb9f1cd8b576fb627a50b01db22be19a1e24ee4078e97c8ecc84428eb184
+SHA512 (openjdk-shenandoah-jdk8u-shenandoah-jdk8u332-b06-4curve.tar.xz) = 663e0093bf7d5698c168e1609b88179ccd8cfb8b1e8ecc937cdaae287960dedea170bce16572f79046e45fafce38dca6848e7524da06a56d4aa0ad15af271775