diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ed3660fc..1ab56b11 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -27,7 +27,7 @@ repos:
       - id: check-shebang-scripts-are-executable
         exclude: "\\.mustache$"
   - repo: https://github.com/Quard/license-header-checker
-    rev: v0.1
+    rev: v0.2.1
     hooks:
       - id: license-header-checker
         files: \.(c|h|dtsi|dts|overlay|keymap)$
@@ -37,6 +37,8 @@ repos:
           - "/*| *| */"
           - --license
           - "\\nCopyright \\(c\\) \\d{4}(-\\d{4})? The ZMK Contributors\\n\\nSPDX-License-Identifier: MIT\\n"
+          - --auto-populate
+          - .pre-commit/license_header.tmpl
       - id: license-header-checker
         files: (\.yaml)|(CMakeLists.txt)|(Kconfig)$
         exclude: ^((app/boards/)|(app/tests/)|(\.pre-commit-config.yaml))
@@ -44,4 +46,6 @@ repos:
           - --comment-style
           - "#"
           - --license
-          - "Copyright \\(c\\) \\d{4}(-\\d{4})? The ZMK Contributors\\nSPDX-License-Identifier: MIT"
+          - "\\s*Copyright \\(c\\) \\d{4}(-\\d{4})? The ZMK Contributors\\n\\s*SPDX-License-Identifier: MIT"
+          - --auto-populate
+          - .pre-commit/license_header.tmpl
diff --git a/.pre-commit/license_header.tmpl b/.pre-commit/license_header.tmpl
new file mode 100644
index 00000000..88af9ad1
--- /dev/null
+++ b/.pre-commit/license_header.tmpl
@@ -0,0 +1,3 @@
+Copyright (c) {YEAR} The ZMK Contributors
+
+SPDX-License-Identifier: MIT
\ No newline at end of file