diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 46e898cba..25f20fc73 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,8 +49,12 @@ jobs:
           mkdir -p _dist_versions
 
           # Push the latest semver tag, excluding prerelease tags
-          LATEST_VERSION="$(git tag | sort -r --version-sort | grep '^v[0-9]' | grep -v '-' | head -n1)"
+          LATEST_VERSION="$(git tag | sort -r --version-sort | grep '^v3.' | grep -v '-' | head -n1)"
           echo "LATEST_VERSION=${LATEST_VERSION}"
+          if [[ "${LATEST_VERSION}" != v3.* ]]; then
+            echo "Error: Latest version ${LATEST_VERSION} is not a v3 release"
+            exit 1
+          fi
           echo "${LATEST_VERSION}" > _dist_versions/helm-latest-version
           echo "${LATEST_VERSION}" > _dist_versions/helm3-latest-version
 
diff --git a/scripts/get-helm-3 b/scripts/get-helm-3
index 5f19bd3fa..dc2b775a2 100755
--- a/scripts/get-helm-3
+++ b/scripts/get-helm-3
@@ -114,7 +114,7 @@ verifySupported() {
 checkDesiredVersion() {
   if [ "x$DESIRED_VERSION" == "x" ]; then
     # Get tag from release URL
-    local latest_release_url="https://get.helm.sh/helm-latest-version"
+    local latest_release_url="https://get.helm.sh/helm3-latest-version"
     local latest_release_response=""
     if [ "${HAS_CURL}" == "true" ]; then
       latest_release_response=$( curl -L --silent --show-error --fail "$latest_release_url" 2>&1 || true )