diff --git a/content/influxdb3/core/install.md b/content/influxdb3/core/install.md
index 29c3e182c..657226893 100644
--- a/content/influxdb3/core/install.md
+++ b/content/influxdb3/core/install.md
@@ -91,13 +91,13 @@ source ~/.zshrc
 
 <!-------------------------------- BEGIN LINUX -------------------------------->
 
-- [{{< product-name >}} • Linux (AMD64, x86_64) • GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_amd64.tar.gz)
+- [{{< product-name >}} • Linux (AMD64, x86_64) • GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_amd64.tar.gz)
   •
-  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_amd64.tar.gz.sha256)
+  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_amd64.tar.gz.sha256)
 
-- [{{< product-name >}} • Linux (ARM64, AArch64) • GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_arm64.tar.gz)
+- [{{< product-name >}} • Linux (ARM64, AArch64) • GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_arm64.tar.gz)
   •
-  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_arm64.tar.gz.sha256)
+  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_arm64.tar.gz.sha256)
 
 <!--------------------------------- END LINUX --------------------------------->
 
@@ -106,9 +106,9 @@ source ~/.zshrc
 
 <!-------------------------------- BEGIN MACOS -------------------------------->
 
-- [{{< product-name >}} • macOS (Silicon, ARM64)](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_darwin_arm64.tar.gz)
+- [{{< product-name >}} • macOS (Silicon, ARM64)](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_darwin_arm64.tar.gz)
   •
-  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_darwin_arm64.tar.gz.sha256)
+  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_darwin_arm64.tar.gz.sha256)
 
 > [!Note]
 > macOS Intel builds are coming soon.
@@ -120,9 +120,9 @@ source ~/.zshrc
 
 <!------------------------------- BEGIN WINDOWS ------------------------------->
 
-- [{{< product-name >}} • Windows (AMD64, x86_64)](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1-windows_amd64.zip)
+- [{{< product-name >}} • Windows (AMD64, x86_64)](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}-windows_amd64.zip)
   •
-  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1-windows_amd64.zip.sha256)
+  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}-windows_amd64.zip.sha256)
 
 <!-------------------------------- END WINDOWS -------------------------------->
 
diff --git a/content/influxdb3/enterprise/install.md b/content/influxdb3/enterprise/install.md
index a07a9e897..913799a24 100644
--- a/content/influxdb3/enterprise/install.md
+++ b/content/influxdb3/enterprise/install.md
@@ -91,13 +91,13 @@ source ~/.zshrc
 
 <!-------------------------------- BEGIN LINUX -------------------------------->
 
-- [{{< product-name >}} • Linux (AMD64, x86_64) • GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_amd64.tar.gz)
+- [{{< product-name >}} • Linux (AMD64, x86_64) • GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_amd64.tar.gz)
   •
-  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_amd64.tar.gz.sha256)
+  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_amd64.tar.gz.sha256)
 
-- [{{< product-name >}} • Linux (ARM64, AArch64) • GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_arm64.tar.gz)
+- [{{< product-name >}} • Linux (ARM64, AArch64) • GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_arm64.tar.gz)
   •
-  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_arm64.tar.gz.sha256)
+  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_arm64.tar.gz.sha256)
 
 <!--------------------------------- END LINUX --------------------------------->
 
@@ -106,9 +106,9 @@ source ~/.zshrc
 
 <!-------------------------------- BEGIN MACOS -------------------------------->
 
-- [{{< product-name >}} • macOS (Silicon, ARM64)](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_darwin_arm64.tar.gz)
+- [{{< product-name >}} • macOS (Silicon, ARM64)](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_darwin_arm64.tar.gz)
   •
-  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_darwin_arm64.tar.gz.sha256)
+  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_darwin_arm64.tar.gz.sha256)
 
 > [!Note]
 > macOS Intel builds are coming soon.
@@ -120,9 +120,9 @@ source ~/.zshrc
 
 <!------------------------------- BEGIN WINDOWS ------------------------------->
 
-- [{{< product-name >}} • Windows (AMD64, x86_64)](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1-windows_amd64.zip)
+- [{{< product-name >}} • Windows (AMD64, x86_64)](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}-windows_amd64.zip)
   •
-  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1-windows_amd64.zip.sha256)
+  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}-windows_amd64.zip.sha256)
 
 <!-------------------------------- END WINDOWS -------------------------------->
 
diff --git a/content/shared/v3-core-get-started/_index.md b/content/shared/v3-core-get-started/_index.md
index 2c44ca569..46b3511cb 100644
--- a/content/shared/v3-core-get-started/_index.md
+++ b/content/shared/v3-core-get-started/_index.md
@@ -67,15 +67,15 @@ curl -O https://www.influxdata.com/d/install_influxdb3.sh \
 
 Or, download and install [build artifacts](/influxdb3/core/install/#download-influxdb-3-core-binaries):
 
-- [Linux | AMD64 (x86_64) | GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_amd64.tar.gz)
+- [Linux | AMD64 (x86_64) | GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_amd64.tar.gz)
   •
-  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_amd64.tar.gz.sha256)
-- [Linux | ARM64 (AArch64) | GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_arm64.tar.gz)
+  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_amd64.tar.gz.sha256)
+- [Linux | ARM64 (AArch64) | GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_arm64.tar.gz)
   •
-  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_arm64.tar.gz.sha256)
-- [macOS | Silicon (ARM64)](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_darwin_arm64.tar.gz)
+  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_arm64.tar.gz.sha256)
+- [macOS | Silicon (ARM64)](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_darwin_arm64.tar.gz)
   •
-  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_darwin_arm64.tar.gz.sha256)
+  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_darwin_arm64.tar.gz.sha256)
 
 > [!Note]
 > macOS Intel builds are coming soon.
@@ -84,9 +84,9 @@ Or, download and install [build artifacts](/influxdb3/core/install/#download-inf
 {{% /tab-content %}}
 {{% tab-content %}}
 <!--------------- BEGIN WINDOWS -------------->
-Download and install the {{% product-name %}} [Windows (AMD64, x86_64) binary](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1-windows_amd64.zip)
+Download and install the {{% product-name %}} [Windows (AMD64, x86_64) binary](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}-windows_amd64.zip)
  •
-[sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1-windows_amd64.zip.sha256)
+[sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}-windows_amd64.zip.sha256)
 <!--------------- END WINDOWS -------------->
 {{% /tab-content %}}
 {{% tab-content %}}
diff --git a/content/shared/v3-enterprise-get-started/_index.md b/content/shared/v3-enterprise-get-started/_index.md
index 18284c64f..2eb4ea29b 100644
--- a/content/shared/v3-enterprise-get-started/_index.md
+++ b/content/shared/v3-enterprise-get-started/_index.md
@@ -66,15 +66,15 @@ curl -O https://www.influxdata.com/d/install_influxdb3.sh \
 
 Or, download and install [build artifacts](/influxdb3/enterprise/install/#download-influxdb-3-enterprise-binaries):
 
-- [Linux | AMD64 (x86_64) | GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_amd64.tar.gz)
+- [Linux | AMD64 (x86_64) | GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_amd64.tar.gz)
   •
-  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_amd64.tar.gz.sha256)
-- [Linux | ARM64 (AArch64) | GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_arm64.tar.gz)
+  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_amd64.tar.gz.sha256)
+- [Linux | ARM64 (AArch64) | GNU](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_arm64.tar.gz)
   •
-  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_linux_arm64.tar.gz.sha256)
-- [macOS | Silicon (ARM64)](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_darwin_arm64.tar.gz)
+  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_linux_arm64.tar.gz.sha256)
+- [macOS | Silicon (ARM64)](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_darwin_arm64.tar.gz)
   •
-  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1_darwin_arm64.tar.gz.sha256)
+  [sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}_darwin_arm64.tar.gz.sha256)
 
 > [!Note]
 > macOS Intel builds are coming soon.
@@ -83,9 +83,9 @@ Or, download and install [build artifacts](/influxdb3/enterprise/install/#downlo
 {{% /tab-content %}}
 {{% tab-content %}}
 <!--------------- BEGIN WINDOWS -------------->
-Download and install the {{% product-name %}} [Windows (AMD64, x86_64) binary](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1-windows_amd64.zip)
+Download and install the {{% product-name %}} [Windows (AMD64, x86_64) binary](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}-windows_amd64.zip)
  •
-[sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-3.0.1-windows_amd64.zip.sha256)
+[sha256](https://dl.influxdata.com/influxdb/releases/influxdb3-{{< product-key >}}-{{< latest-patch >}}-windows_amd64.zip.sha256)
 <!--------------- END WINDOWS -------------->
 {{% /tab-content %}}
 {{% tab-content %}}
diff --git a/data/products.yml b/data/products.yml
index 519167d8b..a18134816 100644
--- a/data/products.yml
+++ b/data/products.yml
@@ -6,6 +6,7 @@ influxdb3_core:
   versions: [core]
   list_order: 2
   latest: core
+  latest_patch: 3.0.1
   placeholder_host: localhost:8181
   ai_sample_questions:
     - How do I install and run InfluxDB 3 Core?
@@ -20,6 +21,7 @@ influxdb3_enterprise:
   versions: [enterprise]
   list_order: 2
   latest: enterprise
+  latest_patch: 3.0.1
   placeholder_host: localhost:8181
   ai_sample_questions:
     - How do I install and run InfluxDB 3 Enterprise?
@@ -82,7 +84,6 @@ influxdb:
     - v1
   latest: v2.7
   latest_patches:
-    v3: 3.0.0alpha
     v2: 2.7.11
     v1: 1.12.0
   latest_cli:
diff --git a/layouts/shortcodes/latest-patch.html b/layouts/shortcodes/latest-patch.html
index 27d8df994..df03397a7 100644
--- a/layouts/shortcodes/latest-patch.html
+++ b/layouts/shortcodes/latest-patch.html
@@ -1,28 +1,28 @@
-{{- $scratch := newScratch -}}
 {{- $cli := .Get "cli" | default false }}
-{{- $productPathData := findRE "[^/]+.*?" .Page.RelPermalink -}}
-{{- $parsedProduct := index $productPathData 0 | default "influxdb" -}}
-{{- $parsedVersion := index $productPathData 1 -}}
+{{- $productPathData := split .Page.RelPermalink "/" -}}
+{{- $parsedProduct := index $productPathData 1 | default "influxdb" -}}
+{{- $parsedVersion := index $productPathData 2 -}}
 {{- $productArg := .Get "product" | default "" -}}
 {{- $versionArg := .Get "version" | default "" -}}
-{{- $minorVersionOffset := .Get "minorVersionOffset" | default 0 -}}
 {{- $product := cond (gt (len $productArg) 0) $productArg $parsedProduct -}}
 {{- $latestVersion := replaceRE `\..*$` "" (index (index .Site.Data.products $product) "latest") -}}
-{{- $versionNoOffset := cond (gt (len $versionArg) 0) $versionArg (cond (ne $product $parsedProduct) $latestVersion $parsedVersion) -}}
-{{- $version := replaceRE `\d+$` (add (int (index (findRE `\d+$` $versionNoOffset) 0)) $minorVersionOffset) $versionNoOffset  -}}
+{{- $version := cond (gt (len $versionArg) 0) $versionArg $parsedVersion  -}}
 {{- $patchVersions := index (index .Site.Data.products $product) "latest_patches" -}}
 {{- $cliVersions := index .Site.Data.products.influxdb "latest_cli" -}}
+{{- $isInfluxDB3 := eq $product "influxdb3" -}}
 {{- if $cli }}
   {{- if eq $version "cloud" -}}
-    {{- $scratch.Set "patchVersion" (index $cliVersions $latestVersion) -}}
+    {{- .Store.Set "patchVersion" (index $cliVersions $latestVersion) -}}
   {{- else -}}
-    {{- $scratch.Set "patchVersion" (index $cliVersions $version) -}}
+    {{- .Store.Set "patchVersion" (index $cliVersions $version) -}}
   {{- end -}}
 {{- else -}}
   {{- if eq $version "cloud" -}}
-    {{- $scratch.Set "patchVersion" (index $patchVersions $latestVersion) -}}
+    {{- .Store.Set "patchVersion" (index $patchVersions $latestVersion) -}}
+  {{- else if $isInfluxDB3 -}}
+    {{- .Store.Set "patchVersion" (index .Site.Data.products (print $product "_" $version)).latest_patch -}}
   {{- else -}}
-    {{- $scratch.Set "patchVersion" (index $patchVersions $version) -}}
+    {{- .Store.Set "patchVersion" (index $patchVersions $version) -}}
   {{- end -}}
 {{- end -}}
-{{- $scratch.Get "patchVersion" -}}
\ No newline at end of file
+{{- .Store.Get "patchVersion" -}}
\ No newline at end of file