diff --git a/.github/generate-strategy.sh b/.github/generate-strategy.sh
index b3d3b48c..4def4901 100755
--- a/.github/generate-strategy.sh
+++ b/.github/generate-strategy.sh
@@ -8,9 +8,12 @@
 #
 set -eu
 
+ROOT_DIR=$(cd "$(dirname "$0")/../"; pwd)
+source "${ROOT_DIR}/lib/repo_funcs.sh"
+
 # Define an optional aliases for some major versions
 declare -A aliases=(
-	[16]='latest'
+	[$POSTGRESQL_LATEST_MAJOR_RELEASE]='latest'
 )
 
 # Define the current default distribution
@@ -66,13 +69,18 @@ generator() {
 
 		# Additional aliases in case we are running in the default distro
 		# i.e. "14", "14.2", "14.2-1", "latest"
-		if [ "${distro}" == "${DEFAULT_DISTRO}" ]; then
+		if [[ "${distro}" == "${DEFAULT_DISTRO}" ]]; then
 			versionAliases+=(
-				"$version"
 				"${postgresImageVersion}"
 				"${postgresImageVersion}-${releaseVersion}"
 				${aliases[$version]:+"${aliases[$version]}"}
 			)
+			# Create a tag with just the major (e.g "14") only for stable versions
+			if [[ "${version}" -le "${POSTGRESQL_LATEST_MAJOR_RELEASE}" ]]; then
+				versionAliases+=(
+					"$version"
+				)
+			fi
 		fi
 
 		# Supported platforms for container images