diff --git a/conf/layer.conf b/conf/layer.conf
index 7feac4c..58ac541 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -6,6 +6,3 @@
 BBFILE_PATTERN_IGNORE_EMPTY_yadro-layer = "1"
 
 LAYERSERIES_COMPAT_yadro-layer = "thud warrior"
-
-# Provide a variable that points the base of the yadro layer.
-YADROBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb b/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb
index 854795b..1865e61 100644
--- a/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb
+++ b/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Nicole AVSBus control"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${YADROBASE}/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-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb b/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb
index 4f77d85..26cad61 100644
--- a/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb
+++ b/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb
@@ -1,7 +1,7 @@
 SUMMARY = "YAML configuration for Nicole"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit allarch
 
diff --git a/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb b/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb
index 8d959e7..83deb43 100644
--- a/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb
+++ b/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Nicole OCC Control sensor IDs"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit native
 inherit openpower-occ-control
diff --git a/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb b/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb
index dc786e5..94000a0 100644
--- a/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb
+++ b/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb
@@ -1,7 +1,7 @@
 SUMMARY = "YAML configuration for Vesnin"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit allarch
 
diff --git a/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config-native.bb b/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config-native.bb
index 51a2f0b..c103010 100644
--- a/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config-native.bb
+++ b/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config-native.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Phosphor LED Group Management for Vesnin"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit native
 inherit obmc-phosphor-utils
diff --git a/meta-vesnin/recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb b/meta-vesnin/recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb
index 2db6c36..71ce60c 100644
--- a/meta-vesnin/recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb
+++ b/meta-vesnin/recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Vesnin OCC Control sensor IDs"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit native
 inherit openpower-occ-control