diff --git a/.github/workflows/_build_deb_reusable.yml b/.github/workflows/_build_deb_reusable.yml
index ed24c79b3..1eb4f679c 100644
--- a/.github/workflows/_build_deb_reusable.yml
+++ b/.github/workflows/_build_deb_reusable.yml
@@ -25,9 +25,10 @@ jobs:
     runs-on: ${{ inputs.run-on }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - name: cache deb
+      - name: Cache amd64 deb
+        if: ${{ runner.arch == 'X64' }}
         uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
-        id: cache-deb
+        id: cache-amd64-deb
         with:
           path: |
             fluent-package/apt/repositories
@@ -35,6 +36,14 @@ jobs:
             fluent-lts-apt-source/apt/repositories
             v7-test/fluent-package/apt/repositories
           key: ${{ runner.os }}-cache-${{ inputs.rake-job }}-${{ runner.arch }}-${{ inputs.cache-group }}-${{ hashFiles('**/config.rb', '**/Rakefile', '**/Gemfile*', 'fluent-package/templates/**', 'fluent-package/debian/**', 'fluent-package/apt/**/Dockerfile') }}
+      - name: Cache arm64 deb
+        if: ${{ runner.arch == 'ARM64' }}
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        id: cache-arm64-deb
+        with:
+          path: |
+            fluent-package/apt/repositories
+          key: ${{ runner.os }}-cache-${{ inputs.rake-job }}-${{ runner.arch }}-${{ inputs.cache-group }}-${{ hashFiles('**/config.rb', '**/Rakefile', '**/Gemfile*', 'fluent-package/templates/**', 'fluent-package/debian/**', 'fluent-package/apt/**/Dockerfile') }}
       - uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # v1.306.0
         with:
           ruby-version: '3.4'
@@ -65,19 +74,19 @@ jobs:
           name: packages-${{ inputs.rake-job }}
           path: fluent-package/apt/repositories
       - name: Upload fluent-apt-source deb
-        if: ${{ ! inputs.next-major }}
+        if: ${{ ! inputs.next-major && runner.arch == 'X64' }}
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: packages-apt-source-${{ inputs.rake-job }}
           path: fluent-apt-source/apt/repositories
       - name: Upload fluent-lts-apt-source deb
-        if: ${{ ! inputs.next-major }}
+        if: ${{ ! inputs.next-major && runner.arch == 'X64' }}
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: packages-lts-apt-source-${{ inputs.rake-job }}
           path: fluent-lts-apt-source/apt/repositories
       - name: Upload v7 fluent-package deb
-        if: ${{ inputs.next-major }}
+        if: ${{ inputs.next-major && runner.arch == 'X64' }}
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: v7-packages-${{ inputs.rake-job }}
diff --git a/.github/workflows/apt.yml b/.github/workflows/apt.yml
index cc2b7faf9..3abaee3e8 100644
--- a/.github/workflows/apt.yml
+++ b/.github/workflows/apt.yml
@@ -237,6 +237,8 @@ jobs:
         with:
           name: packages-${{ matrix.rake-job }}
       - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        # download if needed
+        if: contains(fromJSON('["tmpfiles.sh", "update-to-next-major-version.sh", "downgrade-to-v6-lts-tmpfiles.sh", "update-without-data-lost.sh"]'), matrix.test)
         with:
           name: v7-packages-${{ matrix.rake-job }}
           path: v7-test