diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 565d1b9..9662d6a 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -86,9 +86,17 @@ if [ "$OPENJDK_LATEST" != "" ] ; then
     PROJECT_NAME=openjdk
     REPO_NAME=shenandoah-jdk"${FEATURE_VERSION}"u
     # FIXME: Temporarily use private fork until main repository is in sync
+    # Skip -ga tags since those are the same as the most recent non-ga tag, and
+    # the non-ga tag is the one that is used to generated the official source
+    # tarball.  For example:
+    # ca760c86642aa2e0d9b571aaabac054c0239fbdc  refs/tags/jdk-17.0.10-ga^{}
+    # 25a2e6c20c9a96853714284cabc6b456eb095070  refs/tags/jdk-17.0.10-ga
+    # ca760c86642aa2e0d9b571aaabac054c0239fbdc  refs/tags/jdk-17.0.10+7^{}
+    # e49c5749b10f3e90274b72e9279f794fdd191d27  refs/tags/jdk-17.0.10+7
     VERSION=$(git ls-remote --tags --refs --sort=-version:refname \
                   "${OPENJDK_URL_DEFAULT}/gnu-andrew/${REPO_NAME}.git" \
                   "shenandoah${FEATURE_VERSION}u*" \
+                  | grep -v '\-ga$' \
                   | head --lines 1 | cut --characters 52-)
     FILE_NAME_ROOT=${VERSION}
     WITH_TEMP=1
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 44eb3e8..722f6bd 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -2947,6 +2947,7 @@ cjc.mainProgram(args)
 - generate_source_tarball.sh: shellcheck: Do not use -a (SC2166)
 - generate_source_tarball.sh: shellcheck: Do not use $ on arithmetic variables (SC2004)
 - Use backward-compatible patch syntax
+- generate_source_tarball.sh: Ignore -ga tags with OPENJDK_LATEST
 - Related: RHEL-30937
 
 * Thu Mar 21 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b01-0.2.ea