diff --git a/meta-qualcomm/conf/layer.conf b/meta-qualcomm/conf/layer.conf
index 51c563e..5079054 100644
--- a/meta-qualcomm/conf/layer.conf
+++ b/meta-qualcomm/conf/layer.conf
@@ -3,6 +3,3 @@
 
 BBFILE_COLLECTIONS += "qualcomm"
 BBFILE_PATTERN_qualcomm = ""
-
-# Provide a variable that points the base of the qualcomm layer.
-QUALCOMMBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb
index c7169a9..fb9a728 100644
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb
+++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb
@@ -2,7 +2,7 @@
 DESCRIPTION = "IR38163 work on DC on state, need re-probe for centriq2400 HW design"
 PR = "r0"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${QUALCOMMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit obmc-phosphor-systemd
 
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client.bb
index eb7ed1f..929a11a 100644
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client.bb
+++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client.bb
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend_centriq2400-rep := "${THISDIR}/${PN}:"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${QUALCOMMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 SRC_URI += "file://centriq-2400rep-console-client.sh"
 
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb
index 6e4d517..d43aee8 100644
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb
+++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Phosphor LED Group Management for Centriq2400 REP"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${QUALCOMMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit native
 
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/socupdate.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/socupdate.bb
index 16b11a3..9c4a0bd 100644
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/socupdate.bb
+++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/socupdate.bb
@@ -3,7 +3,7 @@
 HOMEPAGE = ""
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${QUALCOMMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 
 SRC_URI += "file://socupdate.sh"
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/workbook/centriq2400-rep-config.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/workbook/centriq2400-rep-config.bb
index 2f2fd62..220adac 100644
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/workbook/centriq2400-rep-config.bb
+++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/workbook/centriq2400-rep-config.bb
@@ -2,7 +2,7 @@
 DESCRIPTION = "Board wiring information for the Qualcomm Rep system."
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${QUALCOMMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit allarch
 inherit setuptools