diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml
index 7ec7c92e5a..decd3a10f2 100644
--- a/.github/workflows/docker-build-and-push-arm64.yaml
+++ b/.github/workflows/docker-build-and-push-arm64.yaml
@@ -1,6 +1,7 @@
 name: docker-build-and-push-arm64
 
 on:
+  pull_request:
   push:
     branches:
       - main
@@ -13,7 +14,7 @@ jobs:
 
   docker-build-and-push:
     needs: load-env
-    runs-on: buildjet-8vcpu-ubuntu-2204-arm
+    runs-on: buildjet-16vcpu-ubuntu-2204-arm
     steps:
       - name: Check if PR author is the specific user
         id: author-check
@@ -63,9 +64,6 @@ jobs:
             *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
             *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
             *.args.LIB_DIR=aarch64
-            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-${{ github.ref_name }}
-            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-main
-            *.cache-to=type=registry,ref=${{ github.repository }}-buildcache:arm64-${{ github.ref_name }},mode=max
           dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Show disk space
@@ -111,9 +109,6 @@ jobs:
             *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
             *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
             *.args.LIB_DIR=aarch64
-            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-${{ github.ref_name }}
-            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-main
-            *.cache-to=type=registry,ref=${{ github.repository }}-buildcache:arm64-${{ github.ref_name }},mode=max
           dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Show disk space
diff --git a/.github/workflows/health-check-arm64.yaml b/.github/workflows/health-check-arm64.yaml
index cabcd249d0..00905ab7c4 100644
--- a/.github/workflows/health-check-arm64.yaml
+++ b/.github/workflows/health-check-arm64.yaml
@@ -11,7 +11,7 @@ jobs:
 
   docker-build:
     needs: load-env
-    runs-on: buildjet-8vcpu-ubuntu-2204-arm
+    runs-on: buildjet-16vcpu-ubuntu-2204-arm
     steps:
       # https://github.com/actions/checkout/issues/211
       - name: Change permission of workspace