diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
index 183a617..b035388 100644
--- a/.github/workflows/default.yml
+++ b/.github/workflows/default.yml
@@ -18,17 +18,16 @@ env:
 jobs:
   build:
     name: "Build: ${{ matrix.version }}"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false # Don't cancel other jobs if one fails
       matrix:
         include:
-          - version: "7.4"
-          - version: "8.0"
           - version: "8.1"
           - version: "8.2"
           - version: "8.3"
+          - version: "8.4"
     env:
       VERSION: ${{ matrix.version }}
 
@@ -93,3 +92,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push:  ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.prep.outputs.tags }}
+          pull: true
+          no-cache: true
diff --git a/README.md b/README.md
index d841057..49dc1d1 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ This image can be used to directly replace the Docksal CLI image if these additi
 
 ## Handling different PHP versions
 
-The GitHub actions in `.github/workflows/default.yml` define a matrix of PHP versions being generated. Update this list with any new version needed. Must ensure that the upstream Docksal CLI image is available for each version of PHP.
+The GitHub actions in `.github/workflows/default.yml` define a matrix of PHP versions being generated. Update this list with any new version needed. Must ensure that the upstream Docksal CLI image is available for each version of PHP. Currently on version 8.x images are generated.
 
 ## Resources
 
@@ -32,3 +32,4 @@ Please email outrigger@phase2technology.com with security concerns.
 ## Maintainers
 
 [![Phase2 Logo](https://s3.amazonaws.com/phase2.public/logos/phase2-logo.png)](https://www.phase2technology.com)
+
diff --git a/build.sh b/build.sh
index 283ee44..e6b5813 100755
--- a/build.sh
+++ b/build.sh
@@ -3,7 +3,7 @@
 set -ex
 
 # Arguments: $1 CLI_VERSION
-CLI_VERSION=${1:-8.3}
+CLI_VERSION=${1:-8.4}
 
 # Install SQLite 3.x for Drupal 11 testing if CLI version >= 8.3
 INSTALL_SQLITE=false
diff --git a/src/Dockerfile b/src/Dockerfile
index 05a5c24..b32f6ea 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -21,7 +21,7 @@ RUN curl -o /usr/local/bin/kubectl -LO "https://storage.googleapis.com/kubernete
   helm init --client-only
 
 # Also install helm3 as `helm3`
-RUN curl -s https://get.helm.sh/helm-v3.6.2-linux-${TARGETARCH}.tar.gz | sudo tar -C /tmp --no-same-owner -xvzf - linux-${TARGETARCH}/helm --strip-components 1 && \
+RUN curl -s https://get.helm.sh/helm-v3.19.0-linux-${TARGETARCH}.tar.gz | sudo tar -C /tmp --no-same-owner -xvzf - linux-${TARGETARCH}/helm --strip-components 1 && \
     mv /tmp/helm /bin/helm3
 
 # Install Kustomize