diff --git a/.github/workflows/aws-tests.yml b/.github/workflows/aws-tests.yml
index 38e77786227d0..49d763255ca36 100644
--- a/.github/workflows/aws-tests.yml
+++ b/.github/workflows/aws-tests.yml
@@ -447,12 +447,12 @@ jobs:
     name: Publish Test Results
     strategy:
       matrix:
-        runner:
-          - ubuntu-latest
-          - ubuntu-24.04-arm
+        arch:
+          - amd64
+          - arm64
         exclude:
           # skip the ARM integration tests in case we are not on the master and not on the upgrade-dependencies branch and forceARMTests is not set to true
-          - runner: ${{ (github.ref != 'refs/heads/master' && github.ref != 'upgrade-dependencies' && inputs.forceARMTests == false) && 'ubuntu-24.04-arm' || ''}}
+          - arch: ${{ (github.ref != 'refs/heads/master' && github.ref != 'upgrade-dependencies' && inputs.forceARMTests == false) && 'arm64' || ''}}
     needs:
       - test-integration
       - test-bootstrap
@@ -465,20 +465,16 @@ jobs:
     # execute on success or failure, but not if the workflow is cancelled or any of the dependencies has been skipped
     if: always() && !cancelled() && !contains(needs.*.result, 'skipped')
     steps:
-      - name: Determine Runner Architecture
-        shell: bash
-        run: echo "PLATFORM=${{ (runner.arch == 'X64' && 'amd64') || (runner.arch == 'ARM64' && 'arm64') || '' }}" >> $GITHUB_ENV
-
       - name: Download Bootstrap Artifacts
         uses: actions/download-artifact@v4
-        if: ${{ env.PLATFORM == 'amd64' }}
+        if: ${{ matrix.arch == 'amd64' }}
         with:
           pattern: test-results-bootstrap
 
       - name: Download Integration Artifacts
         uses: actions/download-artifact@v4
         with:
-          pattern: test-results-integration-${{ env.PLATFORM }}-*
+          pattern: test-results-integration-${{ matrix.arch }}-*
 
       - name: Publish Bootstrap and Integration Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2
@@ -486,7 +482,7 @@ jobs:
         with:
           files: |
             **/pytest-junit-*.xml
-          check_name: "Test Results (${{ env.PLATFORM }}${{ inputs.testAWSAccountId != '000000000000' && ', MA/MR' || ''}}) - Integration${{ env.PLATFORM == 'amd64' && ', Bootstrap' || ''}}"
+          check_name: "Test Results (${{ matrix.arch }}${{ inputs.testAWSAccountId != '000000000000' && ', MA/MR' || ''}}) - Integration${{ matrix.arch == 'amd64' && ', Bootstrap' || ''}}"
           test_file_prefix: "-/opt/code/localstack/"
           action_fail_on_inconclusive: true
 
@@ -571,12 +567,12 @@ jobs:
     name: Publish Acceptance Test Results
     strategy:
       matrix:
-        runner:
-          - ubuntu-latest
-          - ubuntu-24.04-arm
+        arch:
+          - amd64
+          - arm64
         exclude:
           # skip the ARM integration tests in case we are not on the master and not on the upgrade-dependencies branch and forceARMTests is not set to true
-          - runner: ${{ (github.ref != 'refs/heads/master' && github.ref != 'upgrade-dependencies' && inputs.forceARMTests == false) && 'ubuntu-24.04-arm' || ''}}
+          - arch: ${{ (github.ref != 'refs/heads/master' && github.ref != 'upgrade-dependencies' && inputs.forceARMTests == false) && 'arm64' || ''}}
     needs:
       - test-acceptance
     runs-on: ubuntu-latest
@@ -588,14 +584,10 @@ jobs:
     # execute on success or failure, but not if the workflow is cancelled or any of the dependencies has been skipped
     if: always() && !cancelled() && !contains(needs.*.result, 'skipped')
     steps:
-      - name: Determine Runner Architecture
-        shell: bash
-        run: echo "PLATFORM=${{ (runner.arch == 'X64' && 'amd64') || (runner.arch == 'ARM64' && 'arm64') || '' }}" >> $GITHUB_ENV
-
       - name: Download Acceptance Artifacts
         uses: actions/download-artifact@v4
         with:
-          pattern: test-results-acceptance-${{ env.PLATFORM }}
+          pattern: test-results-acceptance-${{ matrix.arch }}
 
       - name: Publish Acceptance Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2
@@ -603,7 +595,7 @@ jobs:
         with:
           files: |
             **/pytest-junit-*.xml
-          check_name: "Test Results (${{ env.PLATFORM }}${{ inputs.testAWSAccountId != '000000000000' && ', MA/MR' || ''}}) - Acceptance"
+          check_name: "Test Results (${{ matrix.arch }}${{ inputs.testAWSAccountId != '000000000000' && ', MA/MR' || ''}}) - Acceptance"
           test_file_prefix: "-/opt/code/localstack/"
           action_fail_on_inconclusive: true