diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 0c30f6887b2dcc3ffff80bfb6be10837b7461cd4..89a408c3b6a303c6b2aa5e03f4006828d6eab96e 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -115,7 +115,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2021.06.2
+        uses: home-assistant/builder@2021.07.0
         with:
           args: |
             $BUILD_ARGS \
@@ -134,6 +134,7 @@ jobs:
         machine:
           - generic-x86-64
           - intel-nuc
+          - khadas-vim3
           - odroid-c2
           - odroid-c4
           - odroid-n2
@@ -167,7 +168,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2021.06.2
+        uses: home-assistant/builder@2021.07.0
         with:
           args: |
             $BUILD_ARGS \
diff --git a/machine/khadas-vim3 b/machine/khadas-vim3
new file mode 100644
index 0000000000000000000000000000000000000000..be07d6c8abae7e2c6dbff63cb7c312173a4a1951
--- /dev/null
+++ b/machine/khadas-vim3
@@ -0,0 +1,5 @@
+ARG BUILD_VERSION
+FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+
+RUN apk --no-cache add \
+    usbutils