diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8e1bf3a..8da3c84 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,11 +8,13 @@ on:
       - '5.0/**'
       - 'docker/**'
       - 'Makefile'
+      - '.github/workflows/main.yml'
   pull_request:
     paths:
       - '5.0/**'
       - 'docker/**'
       - 'Makefile'
+      - '.github/workflows/main.yml'
 
 jobs:
   build:
@@ -53,7 +55,7 @@ jobs:
       run: |
         LATEST_TAG=$(curl -s https://api.github.com/repos/${{ github.repository }}/releases/latest | jq -r .tag_name)
         if [ -z "$LATEST_TAG" ] || [ "$LATEST_TAG" == "null" ]; then
-          LATEST_TAG="v5.0.0"
+          LATEST_TAG=""
         fi
         echo "LATEST_TAG=$LATEST_TAG" >> $GITHUB_ENV
 
@@ -62,10 +64,19 @@ jobs:
       if: github.event_name == 'push'
       run: |
         LATEST_TAG=${{ env.LATEST_TAG }}
-        LATEST_VERSION=${LATEST_TAG#v}
-        IFS='.' read -r major minor patch <<< "$LATEST_VERSION"
-        NEW_VERSION="$major.$minor.$((patch + 1))"
-        NEW_TAG="v$NEW_VERSION"
+
+        # TCASVS release line is anchored to ASVS-style v5.x tags.
+        # Ignore legacy TASVS tags (for example v1.8.x) when deriving the next tag.
+        if [[ "$LATEST_TAG" =~ ^v5\.([0-9]+)\.([0-9]+)$ ]]; then
+          major=5
+          minor=${BASH_REMATCH[1]}
+          patch=${BASH_REMATCH[2]}
+          NEW_VERSION="$major.$minor.$((patch + 1))"
+          NEW_TAG="v$NEW_VERSION"
+        else
+          NEW_TAG="v5.0.0"
+        fi
+
         echo "NEW_TAG=$NEW_TAG" >> $GITHUB_ENV
 
     - name: Create GitHub Release
diff --git a/index.md b/index.md
index 025f49c..fe282cc 100644
--- a/index.md
+++ b/index.md
@@ -54,6 +54,6 @@ The OWASP TCASVS would like to thank all of our [contributors](https://github.co
   </a>
 </p>
 
-**Bentley is the leading provider of infrastructure engineering software, advancing infrastructure for better quality of life and sustainability.**
+**Bentley Systems is the leading provider of infrastructure engineering software, advancing infrastructure for better quality of life and sustainability.**
 
 Visit [bentley.com](https://www.bentley.com/company/about-us/) to learn more.
\ No newline at end of file