diff --git a/.github/renovate.json b/.github/renovate.json
index acb014b..70bbcbc 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -6,16 +6,14 @@
       "description": "Update SHA-pinned actions in .jinja template files",
       "managerFilePatterns": ["/template/.*\\.ya?ml\\.jinja$/", "/includes/.*\\.jinja$/"],
       "matchStrings": ["uses:\\s+(?<depName>[\\w-]+/[\\w-]+)@(?<currentDigest>[a-f0-9]+)\\s+#\\s+(?<currentValue>v[\\S]+)"],
-      "datasourceTemplate": "github-releases",
-      "extractVersionTemplate": "^(?<version>v\\d+)"
+      "datasourceTemplate": "github-tags"
     },
     {
       "customType": "regex",
       "description": "Update SHA-pinned Nix flake inputs in template files",
       "managerFilePatterns": ["/template/flake\\.nix\\.jinja$/", "/includes/flake-extra-inputs\\.jinja$/"],
       "matchStrings": ["github:(?<depName>[\\w-]+/[\\w-]+)/(?<currentDigest>[a-f0-9]+).*#\\s*(?<currentValue>v[\\S]+)"],
-      "datasourceTemplate": "github-releases",
-      "extractVersionTemplate": "^(?<version>v\\d+)"
+      "datasourceTemplate": "github-tags"
     },
     {
       "customType": "regex",
diff --git a/includes/renovate-template.jinja b/includes/renovate-template.jinja
index a04df26..b65e43d 100644
--- a/includes/renovate-template.jinja
+++ b/includes/renovate-template.jinja
@@ -4,16 +4,14 @@
       "description": "Update SHA-pinned actions in .jinja template files",
       "managerFilePatterns": ["/template/.*\\.ya?ml\\.jinja$/", "/includes/.*\\.jinja$/"],
       "matchStrings": ["uses:\\s+(?<depName>[\\w-]+/[\\w-]+)@(?<currentDigest>[a-f0-9]+)\\s+#\\s+(?<currentValue>v[\\S]+)"],
-      "datasourceTemplate": "github-releases",
-      "extractVersionTemplate": "^(?<version>v\\d+)"
+      "datasourceTemplate": "github-tags"
     },
     {
       "customType": "regex",
       "description": "Update SHA-pinned Nix flake inputs in template files",
       "managerFilePatterns": ["/template/flake\\.nix\\.jinja$/", "/includes/flake-extra-inputs\\.jinja$/"],
       "matchStrings": ["github:(?<depName>[\\w-]+/[\\w-]+)/(?<currentDigest>[a-f0-9]+).*#\\s*(?<currentValue>v[\\S]+)"],
-      "datasourceTemplate": "github-releases",
-      "extractVersionTemplate": "^(?<version>v\\d+)"
+      "datasourceTemplate": "github-tags"
     },
     {
       "customType": "regex",