diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 7c3a42aaaa1..a646510582a 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -197,7 +197,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2023.09.0
+        uses: home-assistant/builder@2023.12.0
         with:
           args: |
             $BUILD_ARGS \
@@ -247,6 +247,7 @@ jobs:
           - raspberrypi3-64
           - raspberrypi4
           - raspberrypi4-64
+          - raspberrypi5-64
           - tinker
           - yellow
           - green
@@ -273,7 +274,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2023.09.0
+        uses: home-assistant/builder@2023.12.0
         with:
           args: |
             $BUILD_ARGS \
diff --git a/machine/raspberrypi5-64 b/machine/raspberrypi5-64
new file mode 100644
index 00000000000..2ed3b3c8e44
--- /dev/null
+++ b/machine/raspberrypi5-64
@@ -0,0 +1,8 @@
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
+
+RUN apk --no-cache add \
+        raspberrypi-userland \
+        raspberrypi-userland-libs