diff --git a/.github/build/Dockerfile b/.github/build/Dockerfile
index 9095dd92..8098ee03 100644
--- a/.github/build/Dockerfile
+++ b/.github/build/Dockerfile
@@ -5,7 +5,3 @@ RUN apt update && apt install jq -y
 ADD ./rush.json ./rush.json
 RUN npm install -g @microsoft/rush@`jq -r .rushVersion ./rush.json`
 RUN rm ./rush.json
-
-RUN useradd -ms /bin/bash builder 
-USER builder
-WORKDIR /home/builder
\ No newline at end of file
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 58ff45cd..370e335f 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -28,6 +28,7 @@ jobs:
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: latest=true
 
       - name: Build and push Docker image
         uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
diff --git a/.github/workflows/docker-ci-checks.yml b/.github/workflows/docker-ci-checks.yml
index 9b6c1ff2..6281614b 100644
--- a/.github/workflows/docker-ci-checks.yml
+++ b/.github/workflows/docker-ci-checks.yml
@@ -10,23 +10,14 @@ on:
       - synchronize
   workflow_dispatch:
     
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}-build-container
-
 jobs:
   ci-checks:
     name: CI Checks
     runs-on: ubuntu-latest
-    container: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+    container: 
+      image: ghcr.io/${{ github.repository }}-build-container
     steps:
-      - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GH_TOKEN }}
-      - name: Setup Node and NPM
-        uses: volta-cli/action@v1
-        with:
-          node-version: 14.15.1
+      - uses: actions/checkout@v3
 
       - name: Cache pnpm modules
         uses: actions/cache@v2
@@ -38,5 +29,5 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-
 
-      - name: Install rush
-        run: node common/scripts/install-run-rush.js install
+      - name: Rush install
+        run: rush install
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 3c02dc18..8e1b0826 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -8,8 +8,8 @@ importers:
   ../../apps/my-app:
     specifiers:
       aws-sdk: ~2.932.0
-      my-controls: workspace:^1.0.3
-      my-toolchain: workspace:^1.0.2
+      my-controls: workspace:^1.0.4
+      my-toolchain: workspace:^1.0.3
       typescript: ^3.0.3
       whatwg-fetch: ^3.0.0
     dependencies:
@@ -22,7 +22,7 @@ importers:
 
   ../../libraries/my-controls:
     specifiers:
-      my-toolchain: workspace:^1.0.2
+      my-toolchain: workspace:^1.0.3
       typescript: ^3.0.3
     devDependencies:
       my-toolchain: link:../../tools/my-toolchain