diff --git a/cheatsheet.md b/cheatsheet.md
index 1a223e2..e5e0c75 100644
--- a/cheatsheet.md
+++ b/cheatsheet.md
@@ -26,10 +26,9 @@
 
 The Palmetto target is `palmetto`.
 
-If you are starting from scratch without a `build/conf` directory you can just:
 ```
 $ cd openbmc
-$ TEMPLATECONF=meta-ibm/meta-palmetto/conf . openbmc-env
+$ . setup palmetto
 $ bitbake obmc-phosphor-image
 ```
 
@@ -37,10 +36,9 @@
 
 The Zaius target is `zaius`.
 
-If you are starting from scratch without a `build/conf` directory you can just:
 ```
 $ cd openbmc
-$ TEMPLATECONF=meta-ingrasys/meta-zaius/conf . openbmc-env
+$ . setup zaius
 $ bitbake obmc-phosphor-image
 ```
 
@@ -48,16 +46,19 @@
 
 If the system you want to build contains different machine configurations:
 
-    meta-<layer>/meta-<system>/conf/machine/machineA.conf
-    meta-<layer>/meta-<system>/conf/machine/machineB.conf
+```
+meta-<layer>/meta-<system>/conf/machine/machineA.conf
+meta-<layer>/meta-<system>/conf/machine/machineB.conf
+```
 
-You can specify the machine configuration you want to build by setting the
-MACHINE environment variable.
+You can specify the machine configuration you want to build by passing the
+name to the `setup`.
 
-    $ cd openbmc
-    $ TEMPLATECONF=meta-<layer>/meta-<system>/conf . openbmc-env
-    $ export MACHINE="machineB"
-    $ bitbake obmc-phosphor-image
+```
+$ cd openbmc
+$ . setup machineB
+$ bitbake obmc-phosphor-image
+```
 
 ## Building the OpenBMC SDK
 Looking for a way to compile your programs for 'ARM' but you happen to be running on a 'PPC' or 'x86' system?  You can build the sdk receive a fakeroot environment.
@@ -76,7 +77,7 @@
 ```
 rm -rf build/conf
 ```
-and running `openbmc-env` again (possibly with `TEMPLATECONF` set).
+and running `setup` again.
 
 ## Useful D-Bus CLI tools
 
diff --git a/development/add-new-system.md b/development/add-new-system.md
index d6fc6fd..0406e54 100644
--- a/development/add-new-system.md
+++ b/development/add-new-system.md
@@ -154,8 +154,7 @@
    ```
    cd ..
    rm -r ./build/conf
-   export TEMPLATECONF=meta-ibm/meta-romulus-prime/conf
-   . openbmc-env
+   . setup romulus-prime
    ```
 
    Run your "bitbake" command.
diff --git a/yocto-development.md b/yocto-development.md
index 275d211..94f19e8 100644
--- a/yocto-development.md
+++ b/yocto-development.md
@@ -21,7 +21,7 @@
 [cheatsheet](cheatsheet.md).
 
 The second case can be helped with Yocto's `devtool`. After running
-`.  openbmc-env`, a tool called `devtool` will be in your path, and can be
+`.  setup <machine>`, a tool called `devtool` will be in your path, and can be
 applied in several ways.
 
 If you have an existing source tree you'd like to integrate, running