diff --git a/renovate.json b/renovate.json
index 4cea9e80c8..0c63605001 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1844,7 +1844,7 @@
     {
       "datasourceTemplate": "git-tags",
       "depNameTemplate": "forgejo/forgejo",
-      "extractVersionTemplate": "^v(?<version>\\d+\\.\\d+\\.\\d+(-\\d+)?)$",
+      "extractVersionTemplate": "^v(?<version>\\d+\\.\\d+\\.\\d+-\\d+?)$",
       "fileMatch": [
         "^tools/forgejo/manifest.yaml$"
       ],
@@ -1852,7 +1852,7 @@
         "version: \"?(?<currentValue>.*?)\"?\\n"
       ],
       "packageNameTemplate": "https://codeberg.org/forgejo/forgejo",
-      "versioningTemplate": "loose"
+      "versioningTemplate": "regex:^(?<major>\\d+?)\\.(?<minor>\\d+?)\\.(?<patch>\\d+?)-(?<build>\\d+?)$"
     },
     {
       "datasourceTemplate": "github-releases",
@@ -5132,7 +5132,7 @@
     {
       "datasourceTemplate": "git-tags",
       "depNameTemplate": "git://repo.or.cz/socat.git",
-      "extractVersionTemplate": "^tag-(<version>\\d+\\.\\d+\\.\\d+(\\.\\d+)?)$",
+      "extractVersionTemplate": "^tag-(?<version>\\d+\\.\\d+\\.\\d+(\\.\\d+)??)$",
       "fileMatch": [
         "^tools/socat/manifest.yaml$"
       ],
diff --git a/tools/forgejo/manifest.yaml b/tools/forgejo/manifest.yaml
index 91e55b0fc2..d7fa7480f0 100644
--- a/tools/forgejo/manifest.yaml
+++ b/tools/forgejo/manifest.yaml
@@ -15,6 +15,6 @@ renovate:
   datasource: git-tags
   package: forgejo/forgejo
   url: https://codeberg.org/forgejo/forgejo
-  extractVersion: ^v(?<version>\d+\.\d+\.\d+(-\d+)?)$
-  versioning: loose
+  extractVersion: ^v(?<version>\d+\.\d+\.\d+-\d+?)$
+  versioning: regex:^(?<major>\d+?)\.(?<minor>\d+?)\.(?<patch>\d+?)-(?<build>\d+?)$
   priority: low
diff --git a/tools/socat/manifest.yaml b/tools/socat/manifest.yaml
index 09d83117e2..0346b39ab7 100644
--- a/tools/socat/manifest.yaml
+++ b/tools/socat/manifest.yaml
@@ -10,6 +10,6 @@ description: Multipurpose relay
 renovate:
   datasource: git-tags
   package: git://repo.or.cz/socat.git
-  extractVersion: ^tag-(<version>\d+\.\d+\.\d+(\.\d+)?)$
+  extractVersion: ^tag-(?<version>\d+\.\d+\.\d+(\.\d+)??)$
   versioning: loose
   priority: low