diff --git a/.github/linters/.check-markdown-links.json b/.github/linters/.check-markdown-links.json
deleted file mode 100644
index c008fa8cf8..0000000000
--- a/.github/linters/.check-markdown-links.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "aliveStatusCodes": [200, 406],
-    "ignorePatterns": [
-        {
-            "pattern": "^https://dev.azure.com/dnceng/internal/_build\\?definitionId=359"
-        },
-        {
-            "pattern": "^https://github.com/dotnet/dotnet-docker/blob/\\{\\{if"
-        },
-        {
-            "pattern": "^https://github.com/dotnet/release/blob/main/.github/ISSUE_TEMPLATE/dotnet-docker-servicing-release.md"
-        },
-        {
-            "pattern": "^https://mcr.microsoft.com/v2/\\{\\{REPO\\}\\}/tags/list"
-        },
-        {
-            "pattern": "^https://support.microsoft.com/contactus/"
-        },
-        {
-            "pattern": "^l-is-the-package-in-the-linux-distro-base-image"
-        }
-    ],
-    "retry":
-    {
-        "count": 3,
-        "interval": "3000"
-    }
-}
diff --git a/.github/linters/.linkspector.yml b/.github/linters/.linkspector.yml
new file mode 100644
index 0000000000..bde805e8b1
--- /dev/null
+++ b/.github/linters/.linkspector.yml
@@ -0,0 +1,12 @@
+aliveStatusCodes:
+  - 200
+  - 406
+dirs:
+  - .
+  - .github
+excludedDirs:
+  - eng/readme-templates
+ignorePatterns:
+  - pattern: "^https://github.com/dotnet/release/blob/main/.github/ISSUE_TEMPLATE/dotnet-docker-servicing-release.md"
+  - pattern: "^l-is-the-package-in-the-linux-distro-base-image"
+useGitIgnore: true
diff --git a/.github/workflows/check-markdown-links.yml b/.github/workflows/check-markdown-links.yml
index 225f3ed838..681caf354a 100644
--- a/.github/workflows/check-markdown-links.yml
+++ b/.github/workflows/check-markdown-links.yml
@@ -17,8 +17,8 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Check markdown links
-        uses: gaurav-nelson/github-action-markdown-link-check@v1
+        uses: umbrelladocs/action-linkspector@v1
         with:
-          config-file: .github/linters/.check-markdown-links.json
-          use-quiet-mode: 'yes'
-          use-verbose-mode: 'no'
+          config_file: .github/linters/.linkspector.yml
+          fail_on_error: true
+          filter_mode: nofilter
diff --git a/documentation/supported-tags.md b/documentation/supported-tags.md
index 9b749462f8..9df97b850c 100644
--- a/documentation/supported-tags.md
+++ b/documentation/supported-tags.md
@@ -9,6 +9,7 @@ Complete tag lists:
 - [aspnet](../README.aspnet.md#full-tag-listing)
 - [sdk](../README.sdk.md#full-tag-listing)
 - [monitor](../README.monitor.md#full-tag-listing)
+- [monitor-base](../README.monitor-base.md#full-tag-listing)
 - [aspire-dashboard](../README.aspire-dashboard.md#full-tag-listing)
 - [samples](../README.samples.md#full-tag-listing)
 - [Microsoft Artifact Registry](https://mcr.microsoft.com/en-us/catalog?search=dotnet/)
diff --git a/documentation/vulnerability-reporting.md b/documentation/vulnerability-reporting.md
index 7602b34ef8..f487ef103e 100644
--- a/documentation/vulnerability-reporting.md
+++ b/documentation/vulnerability-reporting.md
@@ -120,7 +120,19 @@ Rerun the scan of your image using your scanning tool. Ensure you get the latest
 When .NET drops support for an image tag, it means it will no longer be updated, even when there is a new base OS image available.
 This means that vulnerabilities will be reported for that image over time if it continues to be used.
 Our [supported tag policy](supported-tags.md) provides detailed information about when these tags are no longer supported.
-The simple rule to follow: only the tags shown in our [tag listing](supported-tags.md#tag-listing) are supported.
+The simple rule to follow: only the tags shown in our tag listing are supported:
+
+Complete tag lists:
+
+* [runtime-deps](../README.runtime-deps.md#full-tag-listing)
+* [runtime](../README.runtime.md#full-tag-listing)
+* [aspnet](../README.aspnet.md#full-tag-listing)
+* [sdk](../README.sdk.md#full-tag-listing)
+* [monitor](../README.monitor.md#full-tag-listing)
+* [monitor-base](../README.monitor-base.md#full-tag-listing)
+* [aspire-dashboard](../README.aspire-dashboard.md#full-tag-listing)
+* [samples](../README.samples.md#full-tag-listing)
+* [Microsoft Artifact Registry](https://mcr.microsoft.com/en-us/catalog?search=dotnet/)
 
 This script can be used to determine if the .NET image tag is supported: