diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
index 5f8f81c..8a0f3c7 100644
--- a/.github/workflows/build-and-push.yaml
+++ b/.github/workflows/build-and-push.yaml
@@ -56,5 +56,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          no-cache: true
+          build-args: CACHE_BUST=${{ github.sha }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           platforms: linux/amd64
diff --git a/.github/workflows/release-unified.yaml b/.github/workflows/release-unified.yaml
index 0b4d85f..602129f 100644
--- a/.github/workflows/release-unified.yaml
+++ b/.github/workflows/release-unified.yaml
@@ -96,7 +96,9 @@ jobs:
         with:
           context: .
           push: true
-          no-cache: true
+          build-args: CACHE_BUST=${{ github.sha }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.tag }}
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.version }}
diff --git a/Dockerfile b/Dockerfile
index 1d0f6f2..86090c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,8 @@
 FROM jlesage/baseimage-gui:ubuntu-22.04-v4
 
+# Bust cache for all layers below (base image pull is still cached)
+ARG CACHE_BUST
+
 # Set environment variables
 ENV APP_NAME="Dev Container" \
     KEEP_APP_RUNNING=1 \