diff --git a/build-setup.sh b/build-setup.sh
index 4b1b919..5f48ae1 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -28,6 +28,18 @@
   palmetto)
     BITBAKE_CMD="TEMPLATECONF=meta-openbmc-machines/meta-openpower/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"
+    ;;
+  firestone)
+    BITBAKE_CMD="TEMPLATECONF=meta-openbmc-machines/meta-openpower/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"
+    ;;
+  evb-ast2500)
+    BITBAKE_CMD="TEMPLATECONF=meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf source oe-init-build-env"
+    ;;
   qemu)
     BITBAKE_CMD="source openbmc-env"
     ;;