diff --git a/build-setup.sh b/build-setup.sh
index 1e391be..225ce4e 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -113,31 +113,31 @@
 # Work out what build target we should be running and set BitBake command
 case ${target} in
   barreleye)
-    BITBAKE_CMD="TEMPLATECONF=meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf source oe-init-build-env"
+    BITBAKE_CMD="TEMPLATECONF=meta-rackspace/meta-barreleye/conf source oe-init-build-env"
     ;;
   palmetto)
-    BITBAKE_CMD="TEMPLATECONF=meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf source oe-init-build-env"
+    BITBAKE_CMD="TEMPLATECONF=meta-ibm/meta-palmetto/conf source oe-init-build-env"
     ;;
   witherspoon)
-    BITBAKE_CMD="TEMPLATECONF=meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf source oe-init-build-env"
+    BITBAKE_CMD="TEMPLATECONF=meta-ibm/meta-witherspoon/conf source oe-init-build-env"
     ;;
   firestone)
-    BITBAKE_CMD="TEMPLATECONF=meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf source oe-init-build-env"
+    BITBAKE_CMD="TEMPLATECONF=meta-ibm/meta-firestone/conf source oe-init-build-env"
     ;;
   garrison)
-    BITBAKE_CMD="TEMPLATECONF=meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf source oe-init-build-env"
+    BITBAKE_CMD="TEMPLATECONF=meta-ibm/meta-garrison/conf source oe-init-build-env"
     ;;
   evb-ast2500)
-    BITBAKE_CMD="TEMPLATECONF=meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf source oe-init-build-env"
+    BITBAKE_CMD="TEMPLATECONF=meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf source oe-init-build-env"
     ;;
   s2600wf)
-    BITBAKE_CMD="TEMPLATECONF=meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf source oe-init-build-env"
+    BITBAKE_CMD="TEMPLATECONF=meta-intel/meta-s2600wf/conf source oe-init-build-env"
     ;;
   zaius)
-    BITBAKE_CMD="TEMPLATECONF=meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf source oe-init-build-env"
+    BITBAKE_CMD="TEMPLATECONF=meta-ingrasys/meta-zaius/conf source oe-init-build-env"
     ;;
   romulus)
-    BITBAKE_CMD="TEMPLATECONF=meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf source oe-init-build-env"
+    BITBAKE_CMD="TEMPLATECONF=meta-ibm/meta-romulus/conf source oe-init-build-env"
     ;;
   qemu)
     BITBAKE_CMD="source openbmc-env"