diff --git a/machine/raspberrypi b/machine/raspberrypi
index 3cce504661e..2ed3b3c8e44 100644
--- a/machine/raspberrypi
+++ b/machine/raspberrypi
@@ -4,12 +4,5 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi \
-        raspberrypi-libs
-
-##
-# Set symlinks for raspberry pi camera 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
+        raspberrypi-userland \
+        raspberrypi-userland-libs
diff --git a/machine/raspberrypi2 b/machine/raspberrypi2
index c49db40b408..2ed3b3c8e44 100644
--- a/machine/raspberrypi2
+++ b/machine/raspberrypi2
@@ -4,12 +4,5 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi \
-        raspberrypi-libs
-
-##
-# 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
+        raspberrypi-userland \
+        raspberrypi-userland-libs
diff --git a/machine/raspberrypi3 b/machine/raspberrypi3
index c49db40b408..2ed3b3c8e44 100644
--- a/machine/raspberrypi3
+++ b/machine/raspberrypi3
@@ -4,12 +4,5 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi \
-        raspberrypi-libs
-
-##
-# 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
+        raspberrypi-userland \
+        raspberrypi-userland-libs
diff --git a/machine/raspberrypi3-64 b/machine/raspberrypi3-64
index c49db40b408..2ed3b3c8e44 100644
--- a/machine/raspberrypi3-64
+++ b/machine/raspberrypi3-64
@@ -4,12 +4,5 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi \
-        raspberrypi-libs
-
-##
-# 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
+        raspberrypi-userland \
+        raspberrypi-userland-libs
diff --git a/machine/raspberrypi4 b/machine/raspberrypi4
index c49db40b408..2ed3b3c8e44 100644
--- a/machine/raspberrypi4
+++ b/machine/raspberrypi4
@@ -4,12 +4,5 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi \
-        raspberrypi-libs
-
-##
-# 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
+        raspberrypi-userland \
+        raspberrypi-userland-libs
diff --git a/machine/raspberrypi4-64 b/machine/raspberrypi4-64
index c49db40b408..2ed3b3c8e44 100644
--- a/machine/raspberrypi4-64
+++ b/machine/raspberrypi4-64
@@ -4,12 +4,5 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi \
-        raspberrypi-libs
-
-##
-# 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
+        raspberrypi-userland \
+        raspberrypi-userland-libs
diff --git a/machine/yellow b/machine/yellow
index c49db40b408..2ed3b3c8e44 100644
--- a/machine/yellow
+++ b/machine/yellow
@@ -4,12 +4,5 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi \
-        raspberrypi-libs
-
-##
-# 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
+        raspberrypi-userland \
+        raspberrypi-userland-libs