diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d4a934fa..127e8c46 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -108,6 +108,7 @@ jobs:
     - uses: Swatinem/rust-cache@v2
       with:
         key: ${{ matrix.target }}
+
     - name: Download compiler-rt reference sources
       run: |
         curl -L -o code.tar.gz https://github.com/rust-lang/llvm-project/archive/rustc/18.0-2024-02-13.tar.gz
diff --git a/ci/run-docker.sh b/ci/run-docker.sh
index e5ff8a46..470f8cf0 100755
--- a/ci/run-docker.sh
+++ b/ci/run-docker.sh
@@ -41,7 +41,21 @@ run() {
       export RUST_COMPILER_RT_ROOT=./compiler-rt
     fi
 
-    docker build \
+    if [ "$GITHUB_ACTIONS" = "true" ]; then
+      # Enable Docker image caching
+      echo "running in CI"
+      buildx="buildx"
+      build_args=(
+        "${build_args[@]:-}"
+        "--cache-to" "type=gha"
+        "--cache-from" "type=gha"
+      )
+
+      echo $buildx
+      echo $build_args
+    fi
+
+    docker "${buildx:-}" build \
            -t "builtins-$target" \
            ${build_args[@]:-} \
            "ci/docker/$target"