diff --git a/base/base-passwd/debian/meta_data.yaml b/base/base-passwd/debian/meta_data.yaml
index 2c41dd72b..8f69e11c7 100644
--- a/base/base-passwd/debian/meta_data.yaml
+++ b/base/base-passwd/debian/meta_data.yaml
@@ -7,4 +7,5 @@ dl_path:
   sha256sum: 7dda1771ce9107290fea9fca0c11e69334385d614a7c21cbeb50ce9437dd561f
 revision:
   dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    BASE_SRCREV: 9b545c5e197a424d08ed062ca6f11efe7bc824b4
diff --git a/config/puppet-modules/puppet-ldap/debian/meta_data.yaml b/config/puppet-modules/puppet-ldap/debian/meta_data.yaml
index e3d37bc02..3caef3acc 100644
--- a/config/puppet-modules/puppet-ldap/debian/meta_data.yaml
+++ b/config/puppet-modules/puppet-ldap/debian/meta_data.yaml
@@ -8,4 +8,5 @@ dl_path:
   sha256sum: baa275b08ad8f6ce50eb66b22ae98276d6153f4937d551d652e075f769a5578a
 revision:
   dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    BASE_SRCREV: 698c14ccef1ccb9bb93edca275aa7d5c3d926424
diff --git a/ldap/ldapscripts/debian/meta_data.yaml b/ldap/ldapscripts/debian/meta_data.yaml
index c540468cf..aa3ff261b 100644
--- a/ldap/ldapscripts/debian/meta_data.yaml
+++ b/ldap/ldapscripts/debian/meta_data.yaml
@@ -7,4 +7,5 @@ dl_path:
   sha256sum: 68c189714d9ba4cc57d461654f3019b524b6094af167ff998133683542b01ec3
 revision:
   dist: $STX_DIST
-  PKG_GITREVCOUNT:
+  GITREVCOUNT:
+    BASE_SRCREV: 39bc6c35f15dc90edd5160a9e6486222cb2748ab
diff --git a/ldap/openldap/debian/meta_data.yaml b/ldap/openldap/debian/meta_data.yaml
index 1e8897220..a89bb700d 100644
--- a/ldap/openldap/debian/meta_data.yaml
+++ b/ldap/openldap/debian/meta_data.yaml
@@ -13,4 +13,5 @@ dl_files:
     sha256sum: 5a6e0222e948cb3cbafef769ecbbea718d2f724f9c34b8dfb0a2266735a451c9
 revision:
   dist: $STX_DIST
-  PKG_GITREVCOUNT:
+  GITREVCOUNT:
+    BASE_SRCREV: 2821680c8bafa185b55bfb789b5ba5d19cfe8b65
diff --git a/security/keyrings.alt/debian/meta_data.yaml b/security/keyrings.alt/debian/meta_data.yaml
index 7d12bb307..86436f482 100644
--- a/security/keyrings.alt/debian/meta_data.yaml
+++ b/security/keyrings.alt/debian/meta_data.yaml
@@ -1,5 +1,5 @@
 ---
-ver: 4.0.2-1
+debver: 4.0.2-1
 dl_path:
   name: keyrings.alt-debian-4.0.2-1.tar.gz
   url: https://salsa.debian.org/python-team/packages/keyrings.alt/-/archive/debian/4.0.2-1/keyrings.alt-debian-4.0.2-1.tar.gz
@@ -7,4 +7,5 @@ dl_path:
   sha256sum: 2204421931893aab191d78e21a849a269c301681a6911193d2852bb4e77e9ffc
 revision:
   dist: $STX_DIST
-  PKG_GITREVCOUNT:
+  GITREVCOUNT:
+    BASE_SRCREV: de2af4d74df8d7b1d37d07d5f7dbc990e2fda390
diff --git a/security/openscap/debian/meta_data.yaml b/security/openscap/debian/meta_data.yaml
index d7c93bd1a..66147550d 100644
--- a/security/openscap/debian/meta_data.yaml
+++ b/security/openscap/debian/meta_data.yaml
@@ -7,4 +7,5 @@ dl_path:
   sha256sum: 40634f2e27a542b112d2e3b374ebbef7e56af18a3d8ae78da2462ab0b1e4e6b7
 revision:
   dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    BASE_SRCREV: f043585c651e342b9fbf5335811604e013d829db
diff --git a/security/python-keyring/debian/meta_data.yaml b/security/python-keyring/debian/meta_data.yaml
index e81950f51..9fe1c418f 100644
--- a/security/python-keyring/debian/meta_data.yaml
+++ b/security/python-keyring/debian/meta_data.yaml
@@ -7,4 +7,5 @@ dl_path:
   md5sum: b75d88573226d73cc9dbefa0128bb042
 revision:
   dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    BASE_SRCREV: de2af4d74df8d7b1d37d07d5f7dbc990e2fda390