diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 511b7ec12..870e01bf5 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -198,6 +198,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build the Supervisor
+        if: needs.init.outputs.publish != 'true'
         uses: home-assistant/builder@2021.04.2
         with:
           args: |
@@ -206,6 +207,12 @@ jobs:
             --target /data \
             --generic runner
 
+      - name: Pull Supervisor
+        if: needs.init.outputs.publish == 'true'
+        run: |
+          docker pull homeassistant/amd64-hassio-supervisor:${{ needs.init.outputs.version }}
+          docker tag homeassistant/amd64-hassio-supervisor:${{ needs.init.outputs.version }} homeassistant/amd64-hassio-supervisor:runner
+
       - name: Create the Supervisor
         run: |
           mkdir -p /tmp/supervisor/data