diff --git a/meta-phosphor/classes/license_static.bbclass b/meta-phosphor/classes/license_static.bbclass
index dd73017..8666666 100644
--- a/meta-phosphor/classes/license_static.bbclass
+++ b/meta-phosphor/classes/license_static.bbclass
@@ -15,7 +15,7 @@
 # inherit license_static
 ####
 
-STATIC_LICENSE_DIR = "${IMAGE_ROOTFS}/usr/share/www/common-licenses"
+STATIC_LICENSE_DIR = "${IMAGE_ROOTFS}${datadir}/www/common-licenses"
 
 
 def add_index_html_header(f):
diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend
index f7b0a47..f4a258f 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend
+++ b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend
@@ -30,4 +30,4 @@
 }
 
 # make sure that the enterprise-numbers file gets installed in the root FS
-FILES:${PN} += "/usr/share/misc/enterprise-numbers"
+FILES:${PN} += "${datadir}/misc/enterprise-numbers"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb
index e0daa4b..3319b00 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb
@@ -18,4 +18,4 @@
 
 inherit cmake pkgconfig systemd
 
-FILES:${PN} += "/usr/share/ipmbbridge/ipmb-channels.json"
+FILES:${PN} += "${datadir}/ipmbbridge/ipmb-channels.json"