diff --git a/recipes-ccsp/ccsp/rdk-ppp-manager.bb b/recipes-ccsp/ccsp/rdk-ppp-manager.bb
index 6f36ee5..159ef65 100644
--- a/recipes-ccsp/ccsp/rdk-ppp-manager.bb
+++ b/recipes-ccsp/ccsp/rdk-ppp-manager.bb
@@ -8,12 +8,9 @@ DEPENDS = "ccsp-common-library dbus rdk-logger utopia halinterface libunpriv"
 
 require recipes-ccsp/ccsp/ccsp_common.inc
 
-SRC_URI = "git://git@github.com/rdkcentral/RdkPppManager.git;branch=main;protocol=https;name=PppManager"
-SRCREV = "v1.0.0"
-
-SRCREV_FORMAT = "PppManager"
-
-PV = "${RDK_RELEASE}+git${SRCPV}"
+GIT_TAG = "v1.0.0"
+SRC_URI := "git://github.com/rdkcentral/RdkPppManager.git;branch=main;protocol=https;name=PppManager;tag=${GIT_TAG}"
+PV = "${GIT_TAG}+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
@@ -43,6 +40,7 @@ do_install_append () {
     install -d ${D}${exec_prefix}/rdk/pppmanager
     ln -sf ${bindir}/pppmanager ${D}${exec_prefix}/rdk/pppmanager/pppmanager
     install -m 644 ${S}/config/RdkPppManager.xml ${D}/usr/rdk/pppmanager/
+    echo "sha value for recipe " + ${SRCREV_PppManager}
 }
 
 
diff --git a/recipes-ccsp/ccsp/rdk-vlanmanager.bb b/recipes-ccsp/ccsp/rdk-vlanmanager.bb
index 8b833c7..555f3eb 100644
--- a/recipes-ccsp/ccsp/rdk-vlanmanager.bb
+++ b/recipes-ccsp/ccsp/rdk-vlanmanager.bb
@@ -6,13 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e"
 DEPENDS = "ccsp-common-library dbus rdk-logger utopia hal-platform libunpriv"
 
 require recipes-ccsp/ccsp/ccsp_common.inc
+SSTATE_SKIP_CREATION = "1"
 
-SRC_URI = "git://git@github.com/rdkcentral/RdkVlanBridgingManager.git;branch=main;protocol=https;name=VlanBridgingManager"
-SRCREV = "v1.0.0"
-
-SRCREV_FORMAT = "VlanBridgingManager"
-
-PV = "${RDK_RELEASE}+git${SRCPV}"
+GIT_TAG = "v1.0.0"
+SRC_URI = "git://github.com/rdkcentral/RdkVlanBridgingManager.git;branch=main;protocol=https;name=VlanBridgingManager;tag=${GIT_TAG}"
+PV = "${GIT_TAG}+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-ccsp/ccsp/rdk-wanmanager.bb b/recipes-ccsp/ccsp/rdk-wanmanager.bb
index f0ee051..d76d3fb 100644
--- a/recipes-ccsp/ccsp/rdk-wanmanager.bb
+++ b/recipes-ccsp/ccsp/rdk-wanmanager.bb
@@ -8,13 +8,9 @@ DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', '
 
 require recipes-ccsp/ccsp/ccsp_common.inc
 
-PV = "${RDK_RELEASE}+git${SRCPV}"
-SRC_URI = "git://git@github.com/rdkcentral/RdkWanManager.git;branch=main;protocol=https;name=WanManager"
-SRCREV = "v2.2.0"
-
-
-SRCREV_FORMAT = "WanManager"
-
+GIT_TAG = "v2.2.0"
+SRC_URI := "git://github.com/rdkcentral/RdkWanManager.git;branch=main;protocol=https;name=WanManager;tag=${GIT_TAG}"
+PV = "${GIT_TAG}+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-ccsp/ccsp/rdkgponmanager.bb b/recipes-ccsp/ccsp/rdkgponmanager.bb
index 508012b..e1577ac 100644
--- a/recipes-ccsp/ccsp/rdkgponmanager.bb
+++ b/recipes-ccsp/ccsp/rdkgponmanager.bb
@@ -7,15 +7,11 @@ DEPENDS = "ccsp-common-library dbus rdk-logger utopia hal-platform json-hal-lib"
 
 require recipes-ccsp/ccsp/ccsp_common.inc
 
-SRC_URI = "git://git@github.com/rdkcentral/RdkGponManager.git;branch=main;protocol=https;name=GponManager"
-SRCREV = "v1.0.0"
-
-SRCREV_FORMAT = ""
-
+GIT_TAG = "v1.0.0"
+SRC_URI = "git://github.com/rdkcentral/RdkGponManager.git;branch=main;protocol=https;name=GponManager;tag=${GIT_TAG}"
+PV = "${GIT_TAG}+git${SRCPV}"
 EXTRA_OECONF_append  = " --with-ccsp-platform=bcm --with-ccsp-arch=arm "
 
-PV = "${RDK_RELEASE}+git${SRCPV}"
-
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
@@ -36,9 +32,6 @@ CFLAGS_append = " \
 CFLAGS_append  = " ${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', '-DFEATURE_RDKB_WAN_MANAGER', '', d)}"
 
 do_compile_prepend () {
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'WanManagerUnificationEnable', 'true', 'false', d)}; then
-        sed -i '2i <?define WAN_MANAGER_UNIFICATION_ENABLED=True?>' ${S}/config/RdkGponManager.xml
-    fi
     (${PYTHON} ${STAGING_BINDIR_NATIVE}/dm_pack_code_gen.py ${S}/config/RdkGponManager.xml ${S}/source/GponManager/dm_pack_datamodel.c)
 }
 
diff --git a/recipes-ccsp/ccsp/rdkxdslmanager.bb b/recipes-ccsp/ccsp/rdkxdslmanager.bb
index b9b6e9b..f43e4c2 100644
--- a/recipes-ccsp/ccsp/rdkxdslmanager.bb
+++ b/recipes-ccsp/ccsp/rdkxdslmanager.bb
@@ -6,12 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e"
 DEPENDS = "ccsp-common-library dbus rdk-logger utopia json-hal-lib avro-c hal-platform libparodus libunpriv"
 require recipes-ccsp/ccsp/ccsp_common.inc
 
-SRC_URI = "git://git@github.com/rdkcentral/RdkXdslManager.git;branch=main;protocol=https;name=xDSLManager"
-SRCREV = "v1.0.0"
-
-SRCREV_FORMAT = "xDSLManager"
-
-PV = "${RDK_RELEASE}+git${SRCPV}"
+GIT_TAG = "v1.0.0"
+SRC_URI = "git://github.com/rdkcentral/RdkXdslManager.git;branch=main;protocol=https;name=xDSLManager;tag=${GIT_TAG}"
+PV = "${GIT_TAG}+git${SRCPV}"
 
 S = "${WORKDIR}/git"