diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy-image.yml
similarity index 97%
rename from .github/workflows/build-and-deploy.yml
rename to .github/workflows/build-and-deploy-image.yml
index dd9a5b53..56e9fc3d 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy-image.yml
@@ -1,11 +1,11 @@
-name: 'Build and Deploy'
+name: build-and-deploy-images
 
 on:
   workflow_run:
     types:
       - completed
-    branches: [main]
-    workflows: ['Check and Test']
+    branches: [master]
+    workflows: [update-shrinkwrap-and-test]
 
 concurrency:
   group: build-and-upload-images
@@ -17,7 +17,6 @@ env:
 jobs:
   build-packages:
     runs-on: ${{ matrix.runner }}
-
     strategy:
       fail-fast: true
       matrix:
@@ -76,8 +75,8 @@ jobs:
           tags: ${{ steps.compute_vars.outputs.full_image_tag }}
 
   create-manifest:
-    needs: [build-packages]
     runs-on: ubuntu-latest
+    needs: [build-packages]
     strategy:
       fail-fast: true
       matrix:
diff --git a/.github/workflows/check-and-test.yml b/.github/workflows/update-shrinkwrap-and-test.yml
similarity index 83%
rename from .github/workflows/check-and-test.yml
rename to .github/workflows/update-shrinkwrap-and-test.yml
index ecb14cbd..947af869 100644
--- a/.github/workflows/check-and-test.yml
+++ b/.github/workflows/update-shrinkwrap-and-test.yml
@@ -1,4 +1,4 @@
-name: 'Check and Test'
+name: update-shrinkwrap-and-test
 
 on:
   push: {}
@@ -6,11 +6,9 @@ on:
 jobs:
   main:
     runs-on: ubuntu-latest
-
     strategy:
       matrix:
         node-version: [16.x]
-
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}
@@ -22,6 +20,8 @@ jobs:
       - name: Install dependencies with shrinkwrap update
         run: rush update
       - name: Commit and push updated shrinkwrap
+        continue-on-error: true
+        if: ${{ !startsWith(github.ref_name, 'renovate/') }}
         run: |
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
@@ -32,3 +32,5 @@ jobs:
 
           git remote set-url --push origin $REMOTE_HTTPS_URL
           git push -u origin $GITHUB_REF
+      - name: Rebuild all projects
+        run: rush rebuild