diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 7b5a145cd09..aa1c2b2a3e1 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -131,7 +131,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2021.09.0
+        uses: home-assistant/builder@2021.11.4
         with:
           args: |
             $BUILD_ARGS \
@@ -184,7 +184,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2021.11.3
+        uses: home-assistant/builder@2021.11.4
         with:
           args: |
             $BUILD_ARGS \
@@ -291,7 +291,7 @@ jobs:
 
           function validate_image() {
             local image=${1}
-            if ! cas authenticate --signerID notary@home-assistant.io; then
+            if ! cas authenticate --signerID notary@home-assistant.io "${image}"; then
               echo "Invalid signature!"
               exit 1
             fi