diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml
index bca20266..549bc4af 100644
--- a/.github/workflows/build-test-deploy.yaml
+++ b/.github/workflows/build-test-deploy.yaml
@@ -86,3 +86,13 @@ jobs:
           args: release --rm-dist --config deploy/.goreleaser.yaml
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+
+      - name: Update new preflight version in krew-index
+        uses: rajatjindal/krew-release-bot@v0.0.38
+        with:
+          krew_template_file: deploy/krew/preflight.yaml
+      - name: Update new support-bundle version in krew-index
+        uses: rajatjindal/krew-release-bot@v0.0.38
+        with:
+          krew_template_file: deploy/krew/support-bundle.yaml
diff --git a/deploy/krew/preflight.yaml b/deploy/krew/preflight.yaml
index c7c53353..33764aa2 100644
--- a/deploy/krew/preflight.yaml
+++ b/deploy/krew/preflight.yaml
@@ -3,14 +3,13 @@ kind: Plugin
 metadata:
   name: preflight
 spec:
-  version: "v0.9.14"
+  version: {{ .TagName }}
   platforms:
   - selector:
       matchLabels:
         os: linux
         arch: amd64
-    uri: https://github.com/replicatedhq/troubleshoot/releases/download/v0.9.14/preflight_linux_amd64.tar.gz
-    sha256: "25b062760a23e546d22f1687fd460095d61f9fd4a210eec5cc4bacb648b043da"
+    {{addURIAndSha "https://github.com/replicatedhq/troubleshoot/releases/download/{{ .TagName }}/preflight_linux_amd64.tar.gz" .TagName }}
     files:
     - from: preflight
       to: .
@@ -21,8 +20,7 @@ spec:
       matchLabels:
         os: darwin
         arch: amd64
-    uri: https://github.com/replicatedhq/troubleshoot/releases/download/v0.9.14/preflight_darwin_amd64.tar.gz
-    sha256: "00e21d1fe38fd8373136a064e15586b3d4eab49a4d3617167680eea27ebbcc65"
+    {{addURIAndSha "https://github.com/replicatedhq/troubleshoot/releases/download/{{ .TagName }}/preflight_darwin_amd64.tar.gz" .TagName }}
     files:
     - from: preflight
       to: .
@@ -33,8 +31,7 @@ spec:
       matchLabels:
         os: windows
         arch: amd64
-    uri: https://github.com/replicatedhq/troubleshoot/releases/download/v0.9.14/preflight_windows_amd64.zip
-    sha256: "1b10f6a7ca73722c458a44afb9e3a91af2d41681d0e0ea16483413691e363460"
+    {{addURIAndSha "https://github.com/replicatedhq/troubleshoot/releases/download/{{ .TagName }}/preflight.exe_windows_amd64.zip" .TagName }}
     files:
     - from: preflight.exe
       to: .
diff --git a/deploy/krew/support-bundle.yaml b/deploy/krew/support-bundle.yaml
index 039167a0..cb4fe973 100644
--- a/deploy/krew/support-bundle.yaml
+++ b/deploy/krew/support-bundle.yaml
@@ -3,14 +3,13 @@ kind: Plugin
 metadata:
   name: support-bundle
 spec:
-  version: "v0.9.14"
+  version: {{ .TagName }}
   platforms:
   - selector:
       matchLabels:
         os: linux
         arch: amd64
-    uri: https://github.com/replicatedhq/troubleshoot/releases/download/v0.9.14/support-bundle_linux_amd64.tar.gz
-    sha256: "81ed16f3e423535f026909df2823f5da9909ec5762a150c76fde94d985d101c7"
+    {{addURIAndSha "https://github.com/replicatedhq/troubleshoot/releases/download/{{ .TagName }}/support-bundle_linux_amd64.tar.gz" .TagName }}
     files:
     - from: support-bundle
       to: .
@@ -21,8 +20,7 @@ spec:
       matchLabels:
         os: darwin
         arch: amd64
-    uri: https://github.com/replicatedhq/troubleshoot/releases/download/v0.9.14/support-bundle_darwin_amd64.tar.gz
-    sha256: "84d2cd6b3d77ed2e8e83cda6f79b553e443acb2cc7cb0099be2a73934dac46f4"
+    {{addURIAndSha "https://github.com/replicatedhq/troubleshoot/releases/download/{{ .TagName }}/support-bundle_darwin_amd64.tar.gz" .TagName }}
     files:
     - from: support-bundle
       to: .
@@ -33,8 +31,7 @@ spec:
       matchLabels:
         os: windows
         arch: amd64
-    uri: https://github.com/replicatedhq/troubleshoot/releases/download/v0.9.14/support-bundle_windows_amd64.zip
-    sha256: "b968d9168ce97c7dc43cb4e043a8d6762c1e231d68f90826a019571f8d450719"
+    {{addURIAndSha "https://github.com/replicatedhq/troubleshoot/releases/download/{{ .TagName }}/support-bundle.exe_windows_amd64.zip" .TagName }}
     files:
     - from: support-bundle.exe
       to: .