diff --git a/base/anaconda/centos/build_srpm.data b/base/anaconda/centos/build_srpm.data
index c66bf348c..69abd61b8 100644
--- a/base/anaconda/centos/build_srpm.data
+++ b/base/anaconda/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=7
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/base/cluster-resource-agents/centos/build_srpm.data b/base/cluster-resource-agents/centos/build_srpm.data
index 8aeb55368..69abd61b8 100644
--- a/base/cluster-resource-agents/centos/build_srpm.data
+++ b/base/cluster-resource-agents/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/base/dhcp/centos/build_srpm.data b/base/dhcp/centos/build_srpm.data
index c428b1f1d..69abd61b8 100644
--- a/base/dhcp/centos/build_srpm.data
+++ b/base/dhcp/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=9
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/base/dnsmasq/centos/build_srpm.data b/base/dnsmasq/centos/build_srpm.data
index c66bf348c..69abd61b8 100644
--- a/base/dnsmasq/centos/build_srpm.data
+++ b/base/dnsmasq/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=7
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/base/dpkg/centos/build_srpm.data b/base/dpkg/centos/build_srpm.data
index 129d3fbad..cf4c1b57c 100644
--- a/base/dpkg/centos/build_srpm.data
+++ b/base/dpkg/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="$CGCS_BASE/downloads/dpkg_1.18.24.tar.xz"
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/base/haproxy/centos/build_srpm.data b/base/haproxy/centos/build_srpm.data
index c686ecdae..b0740891c 100644
--- a/base/haproxy/centos/build_srpm.data
+++ b/base/haproxy/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="files"
-TIS_PATCH_VER=8
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/base/initscripts/centos/build_srpm.data b/base/initscripts/centos/build_srpm.data
index bc01e8b57..69abd61b8 100644
--- a/base/initscripts/centos/build_srpm.data
+++ b/base/initscripts/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=19
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/base/libevent/centos/build_srpm.data b/base/libevent/centos/build_srpm.data
index 112ca54f4..c3c7e2378 100644
--- a/base/libevent/centos/build_srpm.data
+++ b/base/libevent/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="files/*"
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/base/libfdt/centos/build_srpm.data b/base/libfdt/centos/build_srpm.data
index 80f0c0a58..1a9fb5ae5 100644
--- a/base/libfdt/centos/build_srpm.data
+++ b/base/libfdt/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="$CGCS_BASE/downloads/dtc-1.4.4.tar.gz"
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/base/lighttpd/centos/build_srpm.data b/base/lighttpd/centos/build_srpm.data
index 898fe26d9..69abd61b8 100755
--- a/base/lighttpd/centos/build_srpm.data
+++ b/base/lighttpd/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=8
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/base/net-snmp/centos/build_srpm.data b/base/net-snmp/centos/build_srpm.data
index 12d13e88f..22c8f12b3 100644
--- a/base/net-snmp/centos/build_srpm.data
+++ b/base/net-snmp/centos/build_srpm.data
@@ -1,2 +1,2 @@
-TIS_PATCH_VER=11
+TIS_PATCH_VER=PKG_GITREVCOUNT
 BUILD_IS_SLOW=3
diff --git a/base/ntp/centos/build_srpm.data b/base/ntp/centos/build_srpm.data
index 8aeb55368..69abd61b8 100644
--- a/base/ntp/centos/build_srpm.data
+++ b/base/ntp/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/base/openssh/centos/build_srpm.data b/base/openssh/centos/build_srpm.data
index ed8de7493..69abd61b8 100644
--- a/base/openssh/centos/build_srpm.data
+++ b/base/openssh/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=10
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/base/rt-setup/centos/build_srpm.data b/base/rt-setup/centos/build_srpm.data
index 8aeb55368..69abd61b8 100644
--- a/base/rt-setup/centos/build_srpm.data
+++ b/base/rt-setup/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/base/setup/centos/build_srpm.data b/base/setup/centos/build_srpm.data
index 8443a1b24..c3c7e2378 100644
--- a/base/setup/centos/build_srpm.data
+++ b/base/setup/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="files/*"
-TIS_PATCH_VER=16
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/base/sudo/centos/build_srpm.data b/base/sudo/centos/build_srpm.data
index d3f64f336..69abd61b8 100644
--- a/base/sudo/centos/build_srpm.data
+++ b/base/sudo/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/base/systemd/centos/build_srpm.data b/base/systemd/centos/build_srpm.data
index e13aab400..a97c0063d 100644
--- a/base/systemd/centos/build_srpm.data
+++ b/base/systemd/centos/build_srpm.data
@@ -1,2 +1,2 @@
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
 BUILD_IS_SLOW=7
diff --git a/base/watchdog/centos/build_srpm.data b/base/watchdog/centos/build_srpm.data
index 112ca54f4..c3c7e2378 100644
--- a/base/watchdog/centos/build_srpm.data
+++ b/base/watchdog/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="files/*"
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/bmc/Redfishtool/centos/build_srpm.data b/bmc/Redfishtool/centos/build_srpm.data
index 826da01e3..884e8ee1e 100644
--- a/bmc/Redfishtool/centos/build_srpm.data
+++ b/bmc/Redfishtool/centos/build_srpm.data
@@ -2,5 +2,5 @@ COPY_LIST=" \
   $STX_BASE/downloads/Redfishtool-1.1.0.tar.gz \
   $PKG_BASE/files/* \
 "
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
 
diff --git a/ceph/ceph/centos/build_srpm.data b/ceph/ceph/centos/build_srpm.data
index c5b4417e0..10f37b0c9 100644
--- a/ceph/ceph/centos/build_srpm.data
+++ b/ceph/ceph/centos/build_srpm.data
@@ -22,6 +22,6 @@ if [ -f ${SRC_DIR}/src/.git_version ]; then
 fi
 
 TIS_BASE_SRCREV=02899bfda814146b021136e9d8e80eba494e1126
-TIS_PATCH_VER=GITREVCOUNT+1
+TIS_PATCH_VER=GITREVCOUNT+PKG_GITREVCOUNT
 BUILD_IS_BIG=40
 BUILD_IS_SLOW=26
diff --git a/config/facter/centos/build_srpm.data b/config/facter/centos/build_srpm.data
index 0eac83bbb..69abd61b8 100644
--- a/config/facter/centos/build_srpm.data
+++ b/config/facter/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=4
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-4.8.2/centos/build_srpm.data b/config/puppet-4.8.2/centos/build_srpm.data
index 70b4b5dcb..69abd61b8 100644
--- a/config/puppet-4.8.2/centos/build_srpm.data
+++ b/config/puppet-4.8.2/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/build_srpm.data
index 2bc5a2f47..69abd61b8 100644
--- a/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/build_srpm.data
+++ b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=11
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/build_srpm.data
index 8aeb55368..69abd61b8 100644
--- a/config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/build_srpm.data
+++ b/config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data
index ed8de7493..69abd61b8 100644
--- a/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data
+++ b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=10
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/build_srpm.data
index 8429863c3..69abd61b8 100644
--- a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/build_srpm.data
+++ b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=6
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/build_srpm.data
index 70b4b5dcb..69abd61b8 100644
--- a/config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/build_srpm.data
+++ b/config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/puppet-boolean-1.0.2/centos/build_srpm.data b/config/puppet-modules/puppet-boolean-1.0.2/centos/build_srpm.data
index abed3a7b1..b9ab6e932 100644
--- a/config/puppet-modules/puppet-boolean-1.0.2/centos/build_srpm.data
+++ b/config/puppet-modules/puppet-boolean-1.0.2/centos/build_srpm.data
@@ -13,4 +13,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz"
 
 
 
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/puppet-create_resources/centos/build_srpm.data b/config/puppet-modules/puppet-create_resources/centos/build_srpm.data
index b7700f318..5340b0496 100644
--- a/config/puppet-modules/puppet-create_resources/centos/build_srpm.data
+++ b/config/puppet-modules/puppet-create_resources/centos/build_srpm.data
@@ -13,4 +13,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz"
 
 
 
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/puppet-dnsmasq/centos/build_srpm.data b/config/puppet-modules/puppet-dnsmasq/centos/build_srpm.data
index 09d2ebb68..1fb03bba5 100644
--- a/config/puppet-modules/puppet-dnsmasq/centos/build_srpm.data
+++ b/config/puppet-modules/puppet-dnsmasq/centos/build_srpm.data
@@ -9,4 +9,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz $FILES_BA
 
 
 
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/puppet-drbd-0.3.1/centos/build_srpm.data b/config/puppet-modules/puppet-drbd-0.3.1/centos/build_srpm.data
index 520a2f7fd..c970cd8e1 100644
--- a/config/puppet-modules/puppet-drbd-0.3.1/centos/build_srpm.data
+++ b/config/puppet-modules/puppet-drbd-0.3.1/centos/build_srpm.data
@@ -9,4 +9,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz $FILES_BA
 
 
 
-TIS_PATCH_VER=9
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/puppet-filemapper/centos/build_srpm.data b/config/puppet-modules/puppet-filemapper/centos/build_srpm.data
index 69ab8a223..fd48b94b1 100644
--- a/config/puppet-modules/puppet-filemapper/centos/build_srpm.data
+++ b/config/puppet-modules/puppet-filemapper/centos/build_srpm.data
@@ -13,4 +13,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz"
 
 
 
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/puppet-haproxy-1.5.0/centos/build_srpm.data b/config/puppet-modules/puppet-haproxy-1.5.0/centos/build_srpm.data
index 0eac83bbb..69abd61b8 100644
--- a/config/puppet-modules/puppet-haproxy-1.5.0/centos/build_srpm.data
+++ b/config/puppet-modules/puppet-haproxy-1.5.0/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=4
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/puppet-ldap/centos/build_srpm.data b/config/puppet-modules/puppet-ldap/centos/build_srpm.data
index 1bd3398fc..7ec09ccd8 100644
--- a/config/puppet-modules/puppet-ldap/centos/build_srpm.data
+++ b/config/puppet-modules/puppet-ldap/centos/build_srpm.data
@@ -6,4 +6,4 @@ GIT_SHA=480f13af6d17d1d3fcf0dc7b4bd04b49fa4099e1
 
 COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz"
 
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/puppet-lvm/centos/build_srpm.data b/config/puppet-modules/puppet-lvm/centos/build_srpm.data
index 6c97141c9..98aa602b0 100644
--- a/config/puppet-modules/puppet-lvm/centos/build_srpm.data
+++ b/config/puppet-modules/puppet-lvm/centos/build_srpm.data
@@ -9,4 +9,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz $FILES_BA
 
 
 
-TIS_PATCH_VER=5
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/puppet-network/centos/build_srpm.data b/config/puppet-modules/puppet-network/centos/build_srpm.data
index acc6c8f17..ac9824330 100644
--- a/config/puppet-modules/puppet-network/centos/build_srpm.data
+++ b/config/puppet-modules/puppet-network/centos/build_srpm.data
@@ -13,4 +13,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz $FILES_BA
 
 
 
-TIS_PATCH_VER=7
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/puppet-nslcd/centos/build_srpm.data b/config/puppet-modules/puppet-nslcd/centos/build_srpm.data
index f16d30827..cdc544075 100644
--- a/config/puppet-modules/puppet-nslcd/centos/build_srpm.data
+++ b/config/puppet-modules/puppet-nslcd/centos/build_srpm.data
@@ -13,4 +13,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz"
 
 
 
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/puppet-postgresql-4.8.0/centos/build_srpm.data b/config/puppet-modules/puppet-postgresql-4.8.0/centos/build_srpm.data
index 9bbf7e928..60d1412dc 100644
--- a/config/puppet-modules/puppet-postgresql-4.8.0/centos/build_srpm.data
+++ b/config/puppet-modules/puppet-postgresql-4.8.0/centos/build_srpm.data
@@ -9,4 +9,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz $FILES_BA
 
 
 
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/puppet-puppi/centos/build_srpm.data b/config/puppet-modules/puppet-puppi/centos/build_srpm.data
index 677603382..7d152abd8 100644
--- a/config/puppet-modules/puppet-puppi/centos/build_srpm.data
+++ b/config/puppet-modules/puppet-puppi/centos/build_srpm.data
@@ -5,4 +5,4 @@ GIT_SHA=c1c47f4edfd761d1bbde32a75da0c3fa7cc93a81
 
 COPY_LIST="$CGCS_BASE/downloads/puppet/$MODULE-$GIT_SHA.tar.gz"
 
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/build_srpm.data b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/build_srpm.data
index 8429863c3..69abd61b8 100644
--- a/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/build_srpm.data
+++ b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=6
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/puppet-staging/centos/build_srpm.data b/config/puppet-modules/puppet-staging/centos/build_srpm.data
index 8aeb55368..69abd61b8 100644
--- a/config/puppet-modules/puppet-staging/centos/build_srpm.data
+++ b/config/puppet-modules/puppet-staging/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/config/puppet-modules/puppet-stdlib-4.12.0/centos/build_srpm.data b/config/puppet-modules/puppet-stdlib-4.12.0/centos/build_srpm.data
index 70b4b5dcb..69abd61b8 100644
--- a/config/puppet-modules/puppet-stdlib-4.12.0/centos/build_srpm.data
+++ b/config/puppet-modules/puppet-stdlib-4.12.0/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/database/mariadb/centos/build_srpm.data b/database/mariadb/centos/build_srpm.data
index 4563119df..dfb6e632e 100644
--- a/database/mariadb/centos/build_srpm.data
+++ b/database/mariadb/centos/build_srpm.data
@@ -1,4 +1,4 @@
 COPY_LIST="$CGCS_BASE/downloads/mariadb-10.1.28.tar.gz $PKG_BASE/centos/files/*"
-TIS_PATCH_VER=15
+TIS_PATCH_VER=PKG_GITREVCOUNT
 BUILD_IS_BIG=7
 BUILD_IS_SLOW=19
diff --git a/database/python-psycopg2/centos/build_srpm.data b/database/python-psycopg2/centos/build_srpm.data
index f26198008..a26dac650 100644
--- a/database/python-psycopg2/centos/build_srpm.data
+++ b/database/python-psycopg2/centos/build_srpm.data
@@ -1,2 +1,2 @@
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
 
diff --git a/docker/python-docker/centos/build_srpm.data b/docker/python-docker/centos/build_srpm.data
index 8aeb55368..69abd61b8 100644
--- a/docker/python-docker/centos/build_srpm.data
+++ b/docker/python-docker/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/filesystem/drbd/drbd-tools/centos/build_srpm.data b/filesystem/drbd/drbd-tools/centos/build_srpm.data
index 1873fdbff..cc37ed84d 100644
--- a/filesystem/drbd/drbd-tools/centos/build_srpm.data
+++ b/filesystem/drbd/drbd-tools/centos/build_srpm.data
@@ -1,4 +1,4 @@
 COPY_LIST="$FILES_BASE/* \
            $DISTRO/patches/* \
            $CGCS_BASE/downloads/drbd-8.4.3.tar.gz"
-TIS_PATCH_VER=7
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/filesystem/parted/centos/build_srpm.data b/filesystem/parted/centos/build_srpm.data
index b7ca4ec65..9abfcc827 100644
--- a/filesystem/parted/centos/build_srpm.data
+++ b/filesystem/parted/centos/build_srpm.data
@@ -1,3 +1,3 @@
 COPY_LIST="files/resizepart.sh"
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT
 BUILD_IS_SLOW=5
diff --git a/grub/grub2/centos/build_srpm.data b/grub/grub2/centos/build_srpm.data
index 2b07debcb..aef2fd31f 100644
--- a/grub/grub2/centos/build_srpm.data
+++ b/grub/grub2/centos/build_srpm.data
@@ -1,3 +1,3 @@
 COPY_LIST=""
-TIS_PATCH_VER=12
+TIS_PATCH_VER=PKG_GITREVCOUNT
 BUILD_IS_SLOW=8
diff --git a/grub/grubby/centos/build_srpm.data b/grub/grubby/centos/build_srpm.data
index ca7519660..1782b6c87 100644
--- a/grub/grubby/centos/build_srpm.data
+++ b/grub/grubby/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST=""
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/kubernetes/containerd/centos/build_srpm.data b/kubernetes/containerd/centos/build_srpm.data
index e35b342de..7412ab2d3 100644
--- a/kubernetes/containerd/centos/build_srpm.data
+++ b/kubernetes/containerd/centos/build_srpm.data
@@ -3,4 +3,4 @@ COPY_LIST="${STX_BASE}/downloads/containerd-v1.3.3.tar.gz
            ${STX_BASE}/downloads/crictl-v1.18.0-linux-amd64.tar.gz
            ${FILES_BASE}/*"
 
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/kubernetes/docker-distribution/centos/build_srpm.data b/kubernetes/docker-distribution/centos/build_srpm.data
index 495bb463c..caab94ff6 100644
--- a/kubernetes/docker-distribution/centos/build_srpm.data
+++ b/kubernetes/docker-distribution/centos/build_srpm.data
@@ -2,5 +2,5 @@ VERSION=2.7.1
 TAR_NAME="docker-distribution"
 TAR="$TAR_NAME-v$VERSION.tar.gz"
 COPY_LIST="${CGCS_BASE}/downloads/$TAR $FILES_BASE/*"
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
 
diff --git a/kubernetes/etcd/centos/build_srpm.data b/kubernetes/etcd/centos/build_srpm.data
index b1935c7a6..9c373c2a2 100644
--- a/kubernetes/etcd/centos/build_srpm.data
+++ b/kubernetes/etcd/centos/build_srpm.data
@@ -3,4 +3,4 @@ TAR_NAME=etcd
 TAR="$TAR_NAME-v$VERSION.tar.gz"
 COPY_LIST="${CGCS_BASE}/downloads/$TAR $FILES_BASE/*"
 
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/kubernetes/helm/centos/build_srpm.data b/kubernetes/helm/centos/build_srpm.data
index b9b3a2b64..51cd77d58 100644
--- a/kubernetes/helm/centos/build_srpm.data
+++ b/kubernetes/helm/centos/build_srpm.data
@@ -3,4 +3,5 @@ TAR_NAME=helm
 TAR="$TAR_NAME-v$VERSION-linux-amd64.tar.gz"
 COPY_LIST="${CGCS_BASE}/downloads/$TAR $FILES_BASE/*"
 
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
+
diff --git a/kubernetes/kubernetes/centos/build_srpm.data b/kubernetes/kubernetes/centos/build_srpm.data
index e8eac9db2..90bbe5660 100644
--- a/kubernetes/kubernetes/centos/build_srpm.data
+++ b/kubernetes/kubernetes/centos/build_srpm.data
@@ -6,4 +6,4 @@ CONTRIB="$TAR_NAME-contrib-v$CON_VERSION.tar.gz"
 
 COPY_LIST="${CGCS_BASE}/downloads/$TAR ${CGCS_BASE}/downloads/$CONTRIB  $FILES_BASE/*"
 
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/ldap/ldapscripts/centos/build_srpm.data b/ldap/ldapscripts/centos/build_srpm.data
index 53276137b..b234af2d1 100644
--- a/ldap/ldapscripts/centos/build_srpm.data
+++ b/ldap/ldapscripts/centos/build_srpm.data
@@ -1,3 +1,3 @@
 COPY_LIST="files/* \
            $CGCS_BASE/downloads/ldapscripts-2.0.8.tgz"
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/ldap/openldap/centos/build_srpm.data b/ldap/openldap/centos/build_srpm.data
index 1c4dae2b7..22c8f12b3 100644
--- a/ldap/openldap/centos/build_srpm.data
+++ b/ldap/openldap/centos/build_srpm.data
@@ -1,2 +1,2 @@
-TIS_PATCH_VER=9
+TIS_PATCH_VER=PKG_GITREVCOUNT
 BUILD_IS_SLOW=3
diff --git a/logging/logrotate/centos/build_srpm.data b/logging/logrotate/centos/build_srpm.data
index 0eac83bbb..69abd61b8 100644
--- a/logging/logrotate/centos/build_srpm.data
+++ b/logging/logrotate/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=4
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/networking/lldpd/centos/build_srpm.data b/networking/lldpd/centos/build_srpm.data
index c060f5e80..dd7c8d728 100644
--- a/networking/lldpd/centos/build_srpm.data
+++ b/networking/lldpd/centos/build_srpm.data
@@ -1,4 +1,4 @@
 COPY_LIST="$CGCS_BASE/downloads/lldpd-0.9.0.tar.gz \
            $PKG_BASE/lldpd-0.9.0/* \
            $PKG_BASE/centos/files/*"
-TIS_PATCH_VER=5
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/networking/net-tools/centos/build_srpm.data b/networking/net-tools/centos/build_srpm.data
index bf010977f..c3c7e2378 100644
--- a/networking/net-tools/centos/build_srpm.data
+++ b/networking/net-tools/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="files/*"
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/networking/openvswitch/centos/build_srpm.data b/networking/openvswitch/centos/build_srpm.data
index 3e3f7a532..e482d70d2 100644
--- a/networking/openvswitch/centos/build_srpm.data
+++ b/networking/openvswitch/centos/build_srpm.data
@@ -2,5 +2,5 @@ COPY_LIST="files/* \
   $PATCHES_BASE/* \
   $STX_BASE/downloads/openvswitch-2.11.0.tar.gz \
   $STX_BASE/downloads/dpdk-18.11.tar.xz"
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
 BUILD_IS_SLOW=12
diff --git a/networking/python-ryu/centos/build_srpm.data b/networking/python-ryu/centos/build_srpm.data
index 4a0fba410..32ebff028 100644
--- a/networking/python-ryu/centos/build_srpm.data
+++ b/networking/python-ryu/centos/build_srpm.data
@@ -1,4 +1,4 @@
 TAR_NAME=python-ryu
 SRC_DIR="$CGCS_BASE/git/ryu"
 TIS_BASE_SRCREV=51a1130f6cdcb029a51b6a75d43ac5e4cdde7072
-TIS_PATCH_VER=GITREVCOUNT
+TIS_PATCH_VER=GITREVCOUNT+PKG_GITREVCOUNT
diff --git a/python/python-daemon/centos/build_srpm.data b/python/python-daemon/centos/build_srpm.data
index 8aeb55368..69abd61b8 100644
--- a/python/python-daemon/centos/build_srpm.data
+++ b/python/python-daemon/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/python/python-html5lib/centos/build_srpm.data b/python/python-html5lib/centos/build_srpm.data
index ea9f4c768..c40a7b495 100644
--- a/python/python-html5lib/centos/build_srpm.data
+++ b/python/python-html5lib/centos/build_srpm.data
@@ -1,3 +1,3 @@
 COPY_LIST="$STX_BASE/downloads/html5lib-python-1.0.1.tar.gz"
 
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/python/python-mechanize/centos/build_srpm.data b/python/python-mechanize/centos/build_srpm.data
index 4fa419153..3ed9b1130 100644
--- a/python/python-mechanize/centos/build_srpm.data
+++ b/python/python-mechanize/centos/build_srpm.data
@@ -1,3 +1,3 @@
 COPY_LIST="$STX_BASE/downloads/mechanize-0.4.5.tar.gz"
 
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/python/python-setuptools/centos/build_srpm.data b/python/python-setuptools/centos/build_srpm.data
index 5ec8a3649..e666a6c41 100644
--- a/python/python-setuptools/centos/build_srpm.data
+++ b/python/python-setuptools/centos/build_srpm.data
@@ -2,4 +2,4 @@
 
 COPY_LIST="$CGCS_BASE/downloads/python-setuptools-v38.5.1.tar.gz $PKG_BASE/files/*"
 
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/python/python-voluptuous/centos/build_srpm.data b/python/python-voluptuous/centos/build_srpm.data
index 8aeb55368..69abd61b8 100644
--- a/python/python-voluptuous/centos/build_srpm.data
+++ b/python/python-voluptuous/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/python/python-webencodings/centos/build_srpm.data b/python/python-webencodings/centos/build_srpm.data
index 6e2ea843c..c865039bb 100644
--- a/python/python-webencodings/centos/build_srpm.data
+++ b/python/python-webencodings/centos/build_srpm.data
@@ -1,3 +1,3 @@
 COPY_LIST="$STX_BASE/downloads/python-webencodings-0.5.1.tar.gz"
 
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/requests-toolbelt/centos/build_srpm.data b/requests-toolbelt/centos/build_srpm.data
index 5be243109..3636c616b 100644
--- a/requests-toolbelt/centos/build_srpm.data
+++ b/requests-toolbelt/centos/build_srpm.data
@@ -4,4 +4,4 @@ TAR="$TAR_NAME-$VERSION.tar.gz"
 # SRC_DIR="$TAR_NAME-$VERSION"
 COPY_LIST="${CGCS_BASE}/downloads/$TAR"
 
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/security/libtpms/centos/build_srpm.data b/security/libtpms/centos/build_srpm.data
index 3803d4c06..9d3cdcbbd 100644
--- a/security/libtpms/centos/build_srpm.data
+++ b/security/libtpms/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="$CGCS_BASE/downloads/libtpms-0.6.0-4f0d59d.tar.gz"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/security/python-keyring/centos/build_srpm.data b/security/python-keyring/centos/build_srpm.data
index 3ffb50847..fa4c6e655 100644
--- a/security/python-keyring/centos/build_srpm.data
+++ b/security/python-keyring/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="python-keyring/*"
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/security/shim-signed/centos/build_srpm.data b/security/shim-signed/centos/build_srpm.data
index 70b4b5dcb..69abd61b8 100644
--- a/security/shim-signed/centos/build_srpm.data
+++ b/security/shim-signed/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/security/shim-unsigned/centos/build_srpm.data b/security/shim-unsigned/centos/build_srpm.data
index 12805e870..ab3d4a60b 100644
--- a/security/shim-unsigned/centos/build_srpm.data
+++ b/security/shim-unsigned/centos/build_srpm.data
@@ -1,2 +1,2 @@
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
 COPY_LIST="$PKG_BASE/files/tis-shim.crt"
diff --git a/security/spectre-meltdown-checker/centos/build_srpm.data b/security/spectre-meltdown-checker/centos/build_srpm.data
index ddb6a9049..916cfcf79 100644
--- a/security/spectre-meltdown-checker/centos/build_srpm.data
+++ b/security/spectre-meltdown-checker/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="$CGCS_BASE/downloads/spectre-meltdown-checker-0.37+-5cc77741.tar.gz"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/security/swtpm/centos/build_srpm.data b/security/swtpm/centos/build_srpm.data
index c528a599d..6f623288d 100644
--- a/security/swtpm/centos/build_srpm.data
+++ b/security/swtpm/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="$PKG_BASE/files/* $CGCS_BASE/downloads/swtpm-0.1.0-253eac5.tar.gz"
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/security/tboot/centos/build_srpm.data b/security/tboot/centos/build_srpm.data
index 8aeb55368..69abd61b8 100644
--- a/security/tboot/centos/build_srpm.data
+++ b/security/tboot/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/security/tpm2-tools/centos/build_srpm.data b/security/tpm2-tools/centos/build_srpm.data
index 13364eb8b..a6fc416b3 100644
--- a/security/tpm2-tools/centos/build_srpm.data
+++ b/security/tpm2-tools/centos/build_srpm.data
@@ -1,2 +1,2 @@
 #COPY_LIST="tpm2-tools/*"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/security/tss2/centos/build_srpm.data b/security/tss2/centos/build_srpm.data
index c844c0518..f4dbbd33d 100644
--- a/security/tss2/centos/build_srpm.data
+++ b/security/tss2/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="$CGCS_BASE/downloads/tss2-930.tar.gz"
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/storage-drivers/python-3parclient/centos/build_srpm.data b/storage-drivers/python-3parclient/centos/build_srpm.data
index 1cbb5d3e7..921cba905 100644
--- a/storage-drivers/python-3parclient/centos/build_srpm.data
+++ b/storage-drivers/python-3parclient/centos/build_srpm.data
@@ -1,3 +1,3 @@
 SRC_DIR=$CGCS_BASE/git/python-3parclient
 TIS_BASE_SRCREV=d0e6de393cecc765eba70312c466e91405fb2a69
-TIS_PATCH_VER=1
+TIS_PATCH_VER=GITREVCOUNT+PKG_GITREVCOUNT
diff --git a/storage-drivers/python-lefthandclient/centos/build_srpm.data b/storage-drivers/python-lefthandclient/centos/build_srpm.data
index 2cd7986b9..64d373464 100644
--- a/storage-drivers/python-lefthandclient/centos/build_srpm.data
+++ b/storage-drivers/python-lefthandclient/centos/build_srpm.data
@@ -1,3 +1,3 @@
 SRC_DIR=$CGCS_BASE/git/python-lefthandclient
 TIS_BASE_SRCREV=db9773f0f97c5af04da89fcb7dca2a6ddf8d5e4a
-TIS_PATCH_VER=1
+TIS_PATCH_VER=GITREVCOUNT+PKG_GITREVCOUNT
diff --git a/storage-drivers/trident-installer/centos/build_srpm.data b/storage-drivers/trident-installer/centos/build_srpm.data
index 52ebd2c0d..761eec6de 100644
--- a/storage-drivers/trident-installer/centos/build_srpm.data
+++ b/storage-drivers/trident-installer/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="$CGCS_BASE/downloads/trident-installer-20.04.0.tar.gz"
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/virt/cloud-init/centos/build_srpm.data b/virt/cloud-init/centos/build_srpm.data
index 0eac83bbb..69abd61b8 100644
--- a/virt/cloud-init/centos/build_srpm.data
+++ b/virt/cloud-init/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=4
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/virt/kvm-timer-advance/centos/build_srpm.data b/virt/kvm-timer-advance/centos/build_srpm.data
index 2c3b2cb8b..b0740891c 100644
--- a/virt/kvm-timer-advance/centos/build_srpm.data
+++ b/virt/kvm-timer-advance/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="files"
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/virt/libvirt-python/centos/build_srpm.data b/virt/libvirt-python/centos/build_srpm.data
index d3f64f336..69abd61b8 100644
--- a/virt/libvirt-python/centos/build_srpm.data
+++ b/virt/libvirt-python/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/virt/libvirt/centos/build_srpm.data b/virt/libvirt/centos/build_srpm.data
index 0a1b4bce9..d7b4442e4 100644
--- a/virt/libvirt/centos/build_srpm.data
+++ b/virt/libvirt/centos/build_srpm.data
@@ -5,5 +5,5 @@ COPY_LIST="\
     $CGCS_BASE/downloads/gnulib-ffc927e.tar.gz \
     $CGCS_BASE/downloads/keycodemapdb-16e5b07.tar.gz"
 TIS_BASE_SRCREV=ab58260efaa712650c63bb1917122f270070fa4b
-TIS_PATCH_VER=101
+TIS_PATCH_VER=GITREVCOUNT+PKG_GITREVCOUNT
 BUILD_IS_SLOW=4
diff --git a/virt/qemu/centos/build_srpm.data b/virt/qemu/centos/build_srpm.data
index ada702e33..1b5fa53d1 100644
--- a/virt/qemu/centos/build_srpm.data
+++ b/virt/qemu/centos/build_srpm.data
@@ -6,5 +6,5 @@ COPY_LIST="$CGCS_BASE/downloads/kvm-unit-tests.git-4ea7633.tar.bz2 \
            $PKG_BASE/qemu/qemu_clean.service \
            $PKG_BASE/qemu/qemu-system-x86.conf"
 TIS_BASE_SRCREV=38441756b70eec5807b5f60dad11a93a91199866
-TIS_PATCH_VER=100
+TIS_PATCH_VER=GITREVCOUNT+PKG_GITREVCOUNT