diff --git a/source/_docs/z-wave/controllers.markdown b/source/_docs/z-wave/controllers.markdown
index 31811bfb287..825ef2f0eb4 100644
--- a/source/_docs/z-wave/controllers.markdown
+++ b/source/_docs/z-wave/controllers.markdown
@@ -120,3 +120,12 @@ You should also check the README for details on the overlays. You might find it
   If you've installed the Z-Wave.Me Z-Way software. In order to use Z-Wave JS instead of Z-Way, you'll need to ensure you disable it before you install Home Assistant, or you won't be able to access the board. Do this with `sudo /etc/init.d/z-way-server stop; sudo update-rc.d z-way-server disable`. Alternatively, you could use the [Z-Wave.Me](/integrations/zwave_me) integration.
 
 </div>
+
+#### Aeotec Z-Pi 7 Raspberry Pi HAT/Shield on Home Assistant Yellow
+
+1. Make sure the Aeotec Z-Pi 7 is properly seated on the Home Assistant Yellow. 
+   ![Aeotex Z-Pi 7 on Home Assistant Yellow](/images/docs/z-wave/zpi-7-yellow.jpg).
+1. Carefully [close the case](https://yellow.home-assistant.io/guides/add-ssd-existing-installation/#reassembling-top-part) and power up Home Assistant Yellow.
+1. Follow the procedure on [setting up a Z-Wave JS server](/integrations/zwave_js/#setting-up-a-z-wave-js-server).
+   1. In step 2, follow the manual setup steps to install the Z-Wave integration.
+   1. in Step 4, you will be prompted to choose a **Device path**. Choose **ttyAMA0**.
\ No newline at end of file
diff --git a/source/images/docs/z-wave/zpi-7-yellow.jpg b/source/images/docs/z-wave/zpi-7-yellow.jpg
new file mode 100644
index 00000000000..612599ecb8f
Binary files /dev/null and b/source/images/docs/z-wave/zpi-7-yellow.jpg differ