diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 62cbee9321c..6eea7cea953 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -135,7 +135,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2022.06.1
+        uses: home-assistant/builder@2022.06.2
         with:
           args: |
             $BUILD_ARGS \
@@ -171,6 +171,7 @@ jobs:
           - raspberrypi4
           - raspberrypi4-64
           - tinker
+          - yellow
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v3.0.2
@@ -200,7 +201,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2022.06.1
+        uses: home-assistant/builder@2022.06.2
         with:
           args: |
             $BUILD_ARGS \
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 27307388546..e65b0e7091a 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -88,7 +88,7 @@ jobs:
           name: requirements_diff
 
       - name: Build wheels
-        uses: home-assistant/wheels@2022.06.6
+        uses: home-assistant/wheels@2022.06.7
         with:
           abi: cp310
           tag: musllinux_1_2
@@ -147,7 +147,7 @@ jobs:
           fi
 
       - name: Build wheels
-        uses: home-assistant/wheels@2022.06.6
+        uses: home-assistant/wheels@2022.06.7
         with:
           abi: cp310
           tag: musllinux_1_2
diff --git a/machine/yellow b/machine/yellow
new file mode 100644
index 00000000000..d8e7421f9b1
--- /dev/null
+++ b/machine/yellow
@@ -0,0 +1,14 @@
+ARG BUILD_VERSION
+FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+
+RUN apk --no-cache add \
+        raspberrypi \
+        raspberrypi-libs \
+        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