diff --git a/.github/workflows/build-api-image.sh b/.github/workflows/build-api-image.sh
index 03af321dd9..3d20ad5426 100644
--- a/.github/workflows/build-api-image.sh
+++ b/.github/workflows/build-api-image.sh
@@ -26,14 +26,7 @@ if [[ "${REFSPEC}" == "main" ]]; then
   CACHE_FROM_TAG="latest"
 fi
 
-echo "Pulling cache image ${API_REPO_NAME}:${CACHE_FROM_TAG}"
-if docker buildx imagetools create cache-image --name=${API_REPO_NAME}:${CACHE_FROM_TAG} -platform=linux/amd64,linux/arm64; then
-  API_CACHE_FROM_SCRIPT="--cache-from cache-image"
-else
-  echo "WARNING: Failed to pull ${API_REPO_NAME}:${CACHE_FROM_TAG}, disable build image cache."
-  API_CACHE_FROM_SCRIPT=""
-fi
-
+docker buildx create --use --driver=docker-container
 
 cat<<EOF
   Rolling with tags:
@@ -47,7 +40,8 @@ EOF
 #
 cd api
 docker buildx build \
-  ${API_CACHE_FROM_SCRIPT} \
+  --cache-to type=gha,mode=max,scope=$CACHE_FROM_TAG-image \
+  --cache-from type=gha,mode=max,scope=$CACHE_FROM_TAG-image \
   --platform=linux/amd64,linux/arm64 \
   --build-arg COMMIT_SHA=${SHA} \
   -t "${API_REPO_NAME}:${SHA}" \
diff --git a/.github/workflows/build-api-image.yml b/.github/workflows/build-api-image.yml
index 0d27bca8d5..92eae77073 100644
--- a/.github/workflows/build-api-image.yml
+++ b/.github/workflows/build-api-image.yml
@@ -26,6 +26,9 @@ jobs:
         username: ${{ secrets.DOCKERHUB_USER }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+    - name: Expose GitHub Runtime
+      uses: crazy-max/ghaction-github-runtime@v2
+
     - name: Build and push Docker image
       shell: bash
       env:
diff --git a/.github/workflows/build-web-image.sh b/.github/workflows/build-web-image.sh
index b87933b8bd..7c2ace1f31 100644
--- a/.github/workflows/build-web-image.sh
+++ b/.github/workflows/build-web-image.sh
@@ -26,14 +26,7 @@ if [[ "${REFSPEC}" == "main" ]]; then
   CACHE_FROM_TAG="latest"
 fi
 
-echo "Pulling cache image ${WEB_REPO_NAME}:${CACHE_FROM_TAG}"
-if docker buildx imagetools create cache-image --name=${WEB_REPO_NAME}:${CACHE_FROM_TAG} -platform=linux/amd64,linux/arm64; then
-  WEB_CACHE_FROM_SCRIPT="--cache-from cache-image"
-else
-  echo "WARNING: Failed to pull ${WEB_REPO_NAME}:${CACHE_FROM_TAG}, disable build image cache."
-  WEB_CACHE_FROM_SCRIPT=""
-fi
-
+docker buildx create --use --driver=docker-container
 
 cat<<EOF
   Rolling with tags:
@@ -47,7 +40,8 @@ EOF
 #
 cd web
 docker buildx build \
-  ${WEB_CACHE_FROM_SCRIPT} \
+  --cache-to type=gha,mode=max,scope=$CACHE_FROM_TAG-image \
+  --cache-from type=gha,mode=max,scope=$CACHE_FROM_TAG-image \
   --build-arg COMMIT_SHA=${SHA} \
   --platform=linux/amd64,linux/arm64 \
   -t "${WEB_REPO_NAME}:${SHA}" \
diff --git a/.github/workflows/build-web-image.yml b/.github/workflows/build-web-image.yml
index 87e552c083..456ee40d28 100644
--- a/.github/workflows/build-web-image.yml
+++ b/.github/workflows/build-web-image.yml
@@ -26,6 +26,9 @@ jobs:
         username: ${{ secrets.DOCKERHUB_USER }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+    - name: Expose GitHub Runtime
+      uses: crazy-max/ghaction-github-runtime@v2
+
     - name: Build and push Docker image
       shell: bash
       env: