diff --git a/.github/workflows/ghcr_intel.yml b/.github/workflows/ghcr_intel.yml
index ddaeeb43..1bc93a31 100644
--- a/.github/workflows/ghcr_intel.yml
+++ b/.github/workflows/ghcr_intel.yml
@@ -41,6 +41,6 @@ jobs:
     with:
       name: ${{ matrix.name }}
       flavor: intel
-      platforms: linux/amd64
+      platforms: ${{ matrix.platforms }}
       dockerfile: ${{ matrix.dockerfile }}
     secrets: inherit
diff --git a/.github/workflows/ghcr_nvidia.yml b/.github/workflows/ghcr_nvidia.yml
index a068f7ef..594241d3 100644
--- a/.github/workflows/ghcr_nvidia.yml
+++ b/.github/workflows/ghcr_nvidia.yml
@@ -37,6 +37,6 @@ jobs:
     with:
       name: ${{ matrix.name }}
       flavor: nvidia
-      platforms: linux/amd64
+      platforms: ${{ matrix.platforms }}
       dockerfile: ${{ matrix.dockerfile }}
     secrets: inherit
diff --git a/.github/workflows/image_app.yml b/.github/workflows/image_app.yml
index d9a715aa..e3a99ac5 100644
--- a/.github/workflows/image_app.yml
+++ b/.github/workflows/image_app.yml
@@ -71,3 +71,5 @@ jobs:
           build-args: |
             BASE_IMAGE=ghcr.io/${{ github.repository }}/${{ env.FLAVOR_PREFIX }}base:sha-${{ github.sha }}
           platforms: ${{ inputs.platforms || 'linux/amd64' }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/.github/workflows/image_base.yml b/.github/workflows/image_base.yml
index 6a156390..796cdb8e 100644
--- a/.github/workflows/image_base.yml
+++ b/.github/workflows/image_base.yml
@@ -80,3 +80,5 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: ${{ inputs.platforms || 'linux/amd64' }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max