diff --git a/conf/machine/include/middleware.inc b/conf/machine/include/middleware.inc
index fe952c53..83b6b9a5 100644
--- a/conf/machine/include/middleware.inc
+++ b/conf/machine/include/middleware.inc
@@ -14,3 +14,24 @@ IPK_FEED_URIS += " \
                 ${MIDDLEWARE_ARCH}##${MW_IPK_SERVER_PATH} "
 
 include ${@'oss_mw.inc' if 'STACK_LAYER_OSS_SUPPORT' in d.getVar('DISTRO_FEATURES').split() else ''}
+
+#The following section will be only enabled if CVE_CHECK is set
+
+# Check whether CVE-check is globally inherited
+CVE_CHECK_ENABLED = "${@bb.utils.contains('INHERIT', 'cve-check', '1', '0', d)}"
+
+# Conditionally include CVE-specific configuration
+CVE_CONF_INCLUDE = "${@bb.utils.contains('CVE_CHECK_ENABLED', '1', 'conf/dynamic_sha.inc', '', d)}"
+include ${CVE_CONF_INCLUDE}
+
+# CVE configuration section, equivalent to: if (CVE_CHECK_ENABLED)
+python __anonymous() {
+    if d.getVar("CVE_CHECK_ENABLED") == "1":
+        if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
+            d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_IPK_PATH}")
+
+        d.setVar("CVE_FEED_URL_MIDDLEWARE", "${MIDDLEWARE_ARCH}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/${MIDDLEWARE_ARCH}.tgz")
+        d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MIDDLEWARE};sha256sum=${MIDDLEWARE_ARCH_SHA256SUM}")
+
+}
+
diff --git a/conf/machine/include/oss_mw.inc b/conf/machine/include/oss_mw.inc
index 72769ec8..a20a80b9 100644
--- a/conf/machine/include/oss_mw.inc
+++ b/conf/machine/include/oss_mw.inc
@@ -5,3 +5,24 @@ OPKG_ARCH_PRIORITY:${MW_OSS} = "205"
 MW_OSS_IPK_PATH ?= "middleware-rel/${RELEASE_NUM}"
 MW_OSS_IPK_SERVER_PATH = "${RDK_ARTIFACTS_BASE_URL}/${MW_OSS_IPK_PATH}/${RDK_MW_ARCH}/${MW_OSS}/ipks/${BUILD_VARIANT}"
 IPK_FEED_URIS += " ${MW_OSS}##${MW_OSS_IPK_SERVER_PATH} "
+
+
+#The following section will be only enabled if CVE_CHECK is set
+
+# Check whether CVE-check is globally inherited
+CVE_CHECK_ENABLED = "${@bb.utils.contains('INHERIT', 'cve-check', '1', '0', d)}"
+
+# Conditionally include CVE-specific configuration needed for SHA
+CVE_CONF_INCLUDE = "${@bb.utils.contains('CVE_CHECK_ENABLED', '1', 'conf/dynamic_sha.inc', '', d)}"
+include ${CVE_CONF_INCLUDE}
+
+# CVE configuration section, equivalent to: if (CVE_CHECK_ENABLED)
+python __anonymous() {
+    if d.getVar("CVE_CHECK_ENABLED") == "1":
+        if not d.getVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE"):
+            d.setVar("CVE_LAYER_COMMON_PATH_MIDDLEWARE", "${MW_OSS_IPK_PATH}")
+
+        d.setVar("CVE_FEED_URL_MWOSS", "${MW_OSS}##${RDK_ARTIFACTS_BASE_URL}/${CVE_LAYER_COMMON_PATH_MIDDLEWARE}/${RDK_MW_ARCH}/tarball/cve/${BUILD_VARIANT}/${MW_OSS}.tgz")
+        d.appendVar("CVE_LAYER_FEED_PATH", " ${CVE_FEED_URL_MWOSS};sha256sum=${MW_OSS_SHA256SUM}")
+
+}