diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 13a3323..3fcdbfa 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -81,9 +81,17 @@ if [ "$OPENJDK_LATEST" != "" ] ; then
                           | tail --lines 1)
     PROJECT_NAME=openjdk
     REPO_NAME=jdk"${FEATURE_VERSION}"u
+    # 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}/${PROJECT_NAME}/${REPO_NAME}.git" \
                   "jdk-${FEATURE_VERSION}*" \
+                  | grep --invert-match '\-ga$' \
                   | head --lines 1 | cut --characters 52-)
     FILE_NAME_ROOT=open${VERSION}
     WITH_TEMP=1
diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index 409fa71..99cbce2 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -2491,6 +2491,7 @@ require "copy_jdk_configs.lua"
 - Use featurever macro to specify fips patch
 - Explain patchN syntax situation in a comment
 - generate_source_tarball.sh: Fix whitespace
+- generate_source_tarball.sh: Skip -ga tags
 - Related: RHEL-27133
 
 * Thu Jan 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.10.0.7-2