diff --git a/homeassistant/machine/raspberrypi b/homeassistant/machine/raspberrypi
index b414905..23978fd 100644
--- a/homeassistant/machine/raspberrypi
+++ b/homeassistant/machine/raspberrypi
@@ -3,3 +3,10 @@ FROM homeassistant/armhf-homeassistant:%%VERSION%%
 LABEL io.hass.machine raspberrypi
 
 RUN apk --no-cache add raspberrypi raspberrypi-libs raspberrypi-dev usbutils
+
+##
+# Set symlinks for raspberry pi binaries.
+RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \
+    && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \
+    && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \
+    && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv
diff --git a/homeassistant/machine/raspberrypi2 b/homeassistant/machine/raspberrypi2
index 0e76b2c..bdfa43f 100644
--- a/homeassistant/machine/raspberrypi2
+++ b/homeassistant/machine/raspberrypi2
@@ -3,3 +3,11 @@ FROM homeassistant/armhf-homeassistant:%%VERSION%%
 LABEL io.hass.machine raspberrypi2
 
 RUN apk --no-cache add raspberrypi raspberrypi-libs raspberrypi-dev usbutils
+
+##
+# Set symlinks for raspberry pi binaries.
+RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \
+    && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \
+    && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \
+    && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv
+
diff --git a/homeassistant/machine/raspberrypi3 b/homeassistant/machine/raspberrypi3
index 40227e5..b2ec7d5 100644
--- a/homeassistant/machine/raspberrypi3
+++ b/homeassistant/machine/raspberrypi3
@@ -3,3 +3,11 @@ FROM homeassistant/armhf-homeassistant:%%VERSION%%
 LABEL io.hass.machine raspberrypi3
 
 RUN apk --no-cache add raspberrypi raspberrypi-libs raspberrypi-dev usbutils
+
+##
+# Set symlinks for raspberry pi binaries.
+RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \
+    && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \
+    && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \
+    && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv
+