diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
index 3d5fd42..b8eea15 100644
--- a/.github/workflows/ci_build.yml
+++ b/.github/workflows/ci_build.yml
@@ -12,7 +12,7 @@
 # IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-# Copyright © 2021 Charles Giessen (charles@lunarg.com)
+# Copyright © 2023 Charles Giessen (charles@lunarg.com)
 #
 
 
@@ -38,7 +38,7 @@ jobs:
 
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - uses: lukka/get-cmake@latest
               with:
                 cmakeVersion: 3.15
@@ -71,7 +71,7 @@ jobs:
                 config: [ Debug, Release ]
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - name: CMake Configure
               run: cmake -S. -B build -D CMAKE_BUILD_TYPE=${{matrix.config}} -D VK_BOOTSTRAP_WERROR=ON -D VK_BOOTSTRAP_TEST=ON -A ${{matrix.arch}}
diff --git a/.github/workflows/create_tag.yml b/.github/workflows/create_tag.yml
new file mode 100644
index 0000000..0e62e61
--- /dev/null
+++ b/.github/workflows/create_tag.yml
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+# documentation files (the “Software”), to deal in the Software without restriction, including without
+# limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+# LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Copyright © 2023 Charles Giessen (charles@lunarg.com)
+#
+
+name: Tag header update
+
+on:
+  workflow_dispatch:
+
+jobs:
+  tag_header_update:
+    name: Tag header update
+    runs-on: ubuntu-latest
+    steps:
+      - name: Read CurentBuildVulkanVersion.cmake
+        id: read-version-file
+        uses: juliangruber/read-file-action@v1
+        with:
+          path: ./gen/CurentBuildVulkanVersion.cmake
+
+      - name: Match regex from version file
+        uses: actions-ecosystem/action-regex-match@v2
+        id: regex-match
+        with:
+          text: ${{ steps.read-version-file.outputs.content }}
+          regex: 'VK_BOOTSTRAP_SOURCE_HEADER_VERSION_GIT_TAG (v[0-9]\.[0-9]\.[0-9]*)'
+
+      - name: Push tag
+        uses: EndBug/latest-tag@latest
+        if: ${{ steps.regex-match.outputs.match != '' }}
+        with:
+            tag-name: ${{ steps.regex-match.outputs.group1 }}
+            description: Update to latest Vulkan-Headers
+
diff --git a/.github/workflows/run_autogen.yml b/.github/workflows/run_autogen.yml
index 285c1b1..64d90d5 100644
--- a/.github/workflows/run_autogen.yml
+++ b/.github/workflows/run_autogen.yml
@@ -10,7 +10,7 @@
 # IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-# Copyright © 2022 Charles Giessen (charles@lunarg.com)
+# Copyright © 2023 Charles Giessen (charles@lunarg.com)
 #
 
 # The purpose of this script is to automatically run the autogen code every week and submit a PR to include the changes
@@ -26,6 +26,9 @@ jobs:
   run_autogen:
     name: Run autogen
     runs-on: ubuntu-latest
+    env:
+        PR_NUMBER: ${{ github.event.number }}
+
     steps:
       - name: Set up Python
         uses: actions/setup-python@v2
@@ -36,7 +39,7 @@ jobs:
         run: pip install xmltodict
 
       - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 2