diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
index f730c573c3..219dc7acda 100644
--- a/.github/workflows/debian.yml
+++ b/.github/workflows/debian.yml
@@ -35,8 +35,8 @@ jobs:
     runs-on: ${{ matrix.arch.runner }}
     env:
       WORKSPACE: ${{ github.workspace }}
-      ARCHITECTURE: ${{ matrix.arch }}
-      CACHE_DIR: ${{ github.workspace }}/cache/debian-test/${{ matrix.distro }}-${{ matrix.arch }}
+      ARCHITECTURE: ${{ matrix.arch.name }}
+      CACHE_DIR: ${{ github.workspace }}/cache/debian-test/${{ matrix.distro }}-${{ matrix.arch.name }}
       DISTRIBUTION: ${{ matrix.distro }}
     steps:
     - uses: actions/checkout@v4
@@ -47,5 +47,5 @@ jobs:
     - run: ./dev/ci/tests/debian/run
     - uses: actions/upload-artifact@v4
       with:
-        name: debian-${{ matrix.distro }}-${{ matrix.arch }}
+        name: debian-${{ matrix.distro }}-${{ matrix.arch.name }}
         path: 'output/${{ matrix.distro }}/*'
diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml
index ac117973eb..0ada8287a0 100644
--- a/.github/workflows/rpm.yml
+++ b/.github/workflows/rpm.yml
@@ -35,8 +35,8 @@ jobs:
     runs-on: ${{ matrix.arch.runner }}
     env:
       WORKSPACE: ${{ github.workspace }}
-      ARCHITECTURE: ${{ matrix.arch }}
-      CACHE_DIR: ${{ github.workspace }}/cache/rpm-test/${{ matrix.distro }}-${{ matrix.arch }}
+      ARCHITECTURE: ${{ matrix.arch.name }}
+      CACHE_DIR: ${{ github.workspace }}/cache/rpm-test/${{ matrix.distro }}-${{ matrix.arch.name }}
       DISTRIBUTION: ${{ matrix.distro }}
     steps:
     - uses: actions/checkout@v4
@@ -47,5 +47,5 @@ jobs:
     - run: ./dev/ci/tests/rpm/run
     - uses: actions/upload-artifact@v4
       with:
-        name: rpm-${{ matrix.distro }}-${{ matrix.arch }}
+        name: rpm-${{ matrix.distro }}-${{ matrix.arch.name }}
         path: 'output/${{ matrix.distro }}/*'