diff --git a/.gitignore b/.gitignore
index 2c6a26f..b6f4c68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -294,3 +294,4 @@
 /openjdk-shenandoah-jdk8u-shenandoah-jdk8u402-b06.tar.xz
 /openjdk-shenandoah-jdk8u-shenandoah-jdk8u412-b01.tar.xz
 /shenandoah8u412-b01.tar.xz
+/shenandoah8u412-b07.tar.xz
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index c63b366..472f5ac 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -309,7 +309,7 @@
 # Define version of OpenJDK 8 used
 %global project openjdk
 %global repo shenandoah-jdk8u
-%global openjdk_revision 8u412-b01
+%global openjdk_revision 8u412-b07
 %global shenandoah_revision shenandoah%{openjdk_revision}
 # Define IcedTea version used for SystemTap tapsets and desktop files
 %global icedteaver      3.15.0
@@ -357,7 +357,7 @@
 %global buildver        %(VERSION=%{version_tag}; echo ${VERSION##*-})
 %global rpmrelease      2
 # Settings used by the portable build
-%global portablerelease 2
+%global portablerelease 1
 # Portable suffix differs between RHEL and CentOS
 %if 0%{?centos} == 0
 %global portablesuffix el8
@@ -1261,8 +1261,9 @@ Provides: jre%{?1} = %{epoch}:%{version}-%{release}
 Requires: ca-certificates
 # Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros
 Requires: javapackages-filesystem
-# 2022g required as of JDK-8297804
-Requires: tzdata-java >= 2022g
+# 2024a required as of JDK-8325150
+# Use 2023d until 2024a is in the buildroot
+Requires: tzdata-java >= 2023d
 # for support of kernel stream control
 # libsctp.so.1 is being `dlopen`ed on demand
 Requires: lksctp-tools%{?_isa}
@@ -1679,8 +1680,9 @@ BuildRequires: java-%{buildjdkver}-openjdk-devel >= 1.7.0.151-2.6.11.3
 BuildRequires: libffi
 BuildRequires: libffi-devel
 %endif
-# 2023c required as of JDK-8305113
-BuildRequires: tzdata-java >= 2023c
+# 2024a required as of JDK-8325150
+# Use 2023d until 2024a is in the buildroot
+BuildRequires: tzdata-java >= 2023d
 # Earlier versions have a bug in tree vectorization on PPC
 BuildRequires: gcc >= 4.8.3-8
 
@@ -2916,6 +2918,12 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Fri Apr 05 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b07-0.2.ea
+- Update to shenandoah-jdk8u412-b07 (EA)
+- Require tzdata 2024a due to upstream inclusion of JDK-8322725
+- Only require tzdata 2023d for now as 2024a is unavailable in buildroot
+- Resolves: RHEL-30937
+
 * Fri Mar 22 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b01-0.2.ea
 - Turn off xz multi-threading on i686 as it fails with an out of memory error
 - Move to upstream tag style (shenandoah8ux-by) in preparation for eventually moving back to official sources
diff --git a/sources b/sources
index 708e0fb..42d508c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (shenandoah8u412-b01.tar.xz) = 31b27506ced6f1dddbbe6ace81ff8a4a22b60347c763c5bcef5cd5805c335a64bbfde238c97f97b5b079845668cb93ff0f054c3c76c07ee3cbd3ca9c3bebfc3e
+SHA512 (shenandoah8u412-b07.tar.xz) = 8f085c12ab127a037252c46a3fb74e927b8888ecaafe4ae4f5f1369d2901f3c7a85f71e50fc918761b4095540c24c1bd82ff6e7129160e00ada26f532c968737