diff --git a/kernel-modules/drbd/centos/build_srpm.data b/kernel-modules/drbd/centos/build_srpm.data
index 829ac222..e9006f51 100644
--- a/kernel-modules/drbd/centos/build_srpm.data
+++ b/kernel-modules/drbd/centos/build_srpm.data
@@ -1,4 +1,9 @@
 COPY_LIST="$FILES_BASE/* \
            $DISTRO/patches/* \
-           $CGCS_BASE/downloads/drbd-8.4.11-1.tar.gz"
-TIS_PATCH_VER=4
+           $STX_BASE/downloads/drbd-8.4.11-1.tar.gz"
+OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
+OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
+PKG_BASE_SRCREV=4271ab1f4346779e5e1d73ba5f7c27e48d7be12e
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT
diff --git a/kernel-modules/intel-e1000e/centos/build_srpm.data b/kernel-modules/intel-e1000e/centos/build_srpm.data
index ab56c377..4b2a89f1 100644
--- a/kernel-modules/intel-e1000e/centos/build_srpm.data
+++ b/kernel-modules/intel-e1000e/centos/build_srpm.data
@@ -1,4 +1,9 @@
 COPY_LIST=" \
   $PKG_BASE/files/* \
   $STX_BASE/downloads/e1000e-3.6.0.tar.gz"
-TIS_PATCH_VER=4
+OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
+OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
+PKG_BASE_SRCREV=83ff54f4239c3beeba23f81558fbf0c430233fe2
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
diff --git a/kernel-modules/intel-i40e/centos/build_srpm.data b/kernel-modules/intel-i40e/centos/build_srpm.data
index 8a6c47b3..44996239 100644
--- a/kernel-modules/intel-i40e/centos/build_srpm.data
+++ b/kernel-modules/intel-i40e/centos/build_srpm.data
@@ -1,4 +1,9 @@
 COPY_LIST=" \
   $PKG_BASE/files/* \
   $STX_BASE/downloads/i40e-2.10.19.82.tar.gz"
-TIS_PATCH_VER=4
+OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
+OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
+PKG_BASE_SRCREV=adc347a3e4d6b2eb883f5c879866fa91d19091f6
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
diff --git a/kernel-modules/intel-iavf/centos/build_srpm.data b/kernel-modules/intel-iavf/centos/build_srpm.data
index 10342c50..7c4120a6 100644
--- a/kernel-modules/intel-iavf/centos/build_srpm.data
+++ b/kernel-modules/intel-iavf/centos/build_srpm.data
@@ -1,4 +1,9 @@
 COPY_LIST=" \
   $PKG_BASE/files/* \
   $STX_BASE/downloads/iavf-3.7.61.20.tar.gz"
-TIS_PATCH_VER=4
+OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
+OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
+PKG_BASE_SRCREV=e51acfabf349d27780a3663bfa76887116b1bfee
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
diff --git a/kernel-modules/intel-ixgbe/centos/build_srpm.data b/kernel-modules/intel-ixgbe/centos/build_srpm.data
index 507e697d..78eb0699 100644
--- a/kernel-modules/intel-ixgbe/centos/build_srpm.data
+++ b/kernel-modules/intel-ixgbe/centos/build_srpm.data
@@ -1,4 +1,9 @@
 COPY_LIST=" \
   $PKG_BASE/files/* \
   $STX_BASE/downloads/ixgbe-5.6.5.tar.gz"
-TIS_PATCH_VER=4
+OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
+OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
+PKG_BASE_SRCREV=04704ebb785074dbb38b65f9d9457b6e8c2a11c6
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
diff --git a/kernel-modules/intel-ixgbevf/centos/build_srpm.data b/kernel-modules/intel-ixgbevf/centos/build_srpm.data
index 55b229e0..ff847b6a 100644
--- a/kernel-modules/intel-ixgbevf/centos/build_srpm.data
+++ b/kernel-modules/intel-ixgbevf/centos/build_srpm.data
@@ -1,4 +1,9 @@
 COPY_LIST=" \
   $PKG_BASE/files/* \
   $STX_BASE/downloads/ixgbevf-4.6.3.tar.gz"
-TIS_PATCH_VER=4
+OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
+OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
+PKG_BASE_SRCREV=04704ebb785074dbb38b65f9d9457b6e8c2a11c6
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
diff --git a/kernel-modules/intel-opae-fpga/centos/build_srpm.data b/kernel-modules/intel-opae-fpga/centos/build_srpm.data
index 40f77383..b898aec7 100644
--- a/kernel-modules/intel-opae-fpga/centos/build_srpm.data
+++ b/kernel-modules/intel-opae-fpga/centos/build_srpm.data
@@ -1,4 +1,9 @@
 COPY_LIST=" \
   $PATCHES_BASE/* \
   $STX_BASE/downloads/opae-intel-fpga-driver-2.0.1.tar.gz"
-TIS_PATCH_VER=3
+OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
+OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
+PKG_BASE_SRCREV=b57a3e6641c2bdf826942df3798df77086d06497
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
diff --git a/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data b/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data
index fc76d43c..5b29eb5b 100644
--- a/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data
+++ b/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data
@@ -1,3 +1,8 @@
 COPY_LIST="$PKG_BASE/files/modules-load.conf"
-TIS_PATCH_VER=4
+OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
+OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
+PKG_BASE_SRCREV=c3a925b0b8111e9dc958a5934a613f491be71ae3
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+2
 BUILD_IS_SLOW=3
diff --git a/kernel-modules/qat17/centos/build_srpm.data b/kernel-modules/qat17/centos/build_srpm.data
index e3fffa7a..c15d956c 100644
--- a/kernel-modules/qat17/centos/build_srpm.data
+++ b/kernel-modules/qat17/centos/build_srpm.data
@@ -2,5 +2,10 @@ COPY_LIST=" \
   $PKG_BASE/files/* \
   $STX_BASE/downloads/qat1.7.l.4.5.0-00034.tar.gz \
 "
-TIS_PATCH_VER=4
+OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
+OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
+PKG_BASE_SRCREV=3b8696650cb85c558c1b4c6d315c64d57f178527
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
 BUILD_IS_SLOW=3
diff --git a/kernel-rt/centos/build_srpm.data b/kernel-rt/centos/build_srpm.data
index 9e2d69fc..3c04be34 100644
--- a/kernel-rt/centos/build_srpm.data
+++ b/kernel-rt/centos/build_srpm.data
@@ -1,4 +1,5 @@
 COPY_LIST="files/*"
-TIS_PATCH_VER=3
+PKG_BASE_SRCREV=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
+TIS_PATCH_VER=PKG_GITREVCOUNT+1
 BUILD_IS_BIG=21
 BUILD_IS_SLOW=16
diff --git a/kernel-std/centos/build_srpm.data b/kernel-std/centos/build_srpm.data
index 9e2d69fc..a10ed664 100644
--- a/kernel-std/centos/build_srpm.data
+++ b/kernel-std/centos/build_srpm.data
@@ -1,4 +1,5 @@
 COPY_LIST="files/*"
-TIS_PATCH_VER=3
+PKG_BASE_SRCREV=145ff64b9734e5c45cfd8eb837a04e257b4b9581
+TIS_PATCH_VER=PKG_GITREVCOUNT+1
 BUILD_IS_BIG=21
 BUILD_IS_SLOW=16
diff --git a/userspace/mellanox/libibverbs/centos/build_srpm.data b/userspace/mellanox/libibverbs/centos/build_srpm.data
index d3f64f33..05497238 100644
--- a/userspace/mellanox/libibverbs/centos/build_srpm.data
+++ b/userspace/mellanox/libibverbs/centos/build_srpm.data
@@ -1 +1,6 @@
-TIS_PATCH_VER=3
+OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
+OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
+PKG_BASE_SRCREV=b23443c0e3fc17fc5b3eb93ede0f979e4c60562a
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
diff --git a/userspace/mellanox/rdma-core/centos/build_srpm.data b/userspace/mellanox/rdma-core/centos/build_srpm.data
index d3f64f33..05497238 100644
--- a/userspace/mellanox/rdma-core/centos/build_srpm.data
+++ b/userspace/mellanox/rdma-core/centos/build_srpm.data
@@ -1 +1,6 @@
-TIS_PATCH_VER=3
+OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
+OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
+PKG_BASE_SRCREV=b23443c0e3fc17fc5b3eb93ede0f979e4c60562a
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1