diff --git a/.github/workflows/test-install-scripts.yml b/.github/workflows/test-install-scripts.yml
index 3e7006b1878e..418ffc0f1553 100644
--- a/.github/workflows/test-install-scripts.yml
+++ b/.github/workflows/test-install-scripts.yml
@@ -22,7 +22,7 @@ concurrency:
 
 jobs:
   test_scripts:
-    name: Native ${{ matrix.os.emoji }} ${{ matrix.arch.name }} ${{ matrix.development.name }} - ${{ matrix.editable.name }}
+    name: Native ${{ matrix.os.emoji }} ${{ matrix.arch.emoji }} ${{ matrix.development.name }} - ${{ matrix.editable.name }}
     runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
     strategy:
       fail-fast: false
@@ -49,8 +49,10 @@ jobs:
             matrix: windows
         arch:
           - name: ARM
+            emoji: 💪
             matrix: arm
           - name: Intel
+            emoji: 🌀
             matrix: intel
         development:
           - name: Non-dev
diff --git a/.github/workflows/test-single.yml b/.github/workflows/test-single.yml
index dc730e33b3dd..cde9ef964c7d 100644
--- a/.github/workflows/test-single.yml
+++ b/.github/workflows/test-single.yml
@@ -8,7 +8,7 @@ name: test
 on:
   workflow_call:
     inputs:
-      emoji:
+      os-emoji:
         required: true
         type: string
       matrix:
@@ -35,6 +35,9 @@ on:
       arch:
         required: true
         type: string
+      arch-emoji:
+        required: true
+        type: string
       collect-junit:
         required: false
         type: boolean
@@ -50,7 +53,7 @@ defaults:
 
 jobs:
   test:
-    name: ${{ matrix.os.emoji }} ${{ matrix.configuration.name }} - ${{ matrix.python.name }}
+    name: ${{ matrix.os.emoji }} ${{ matrix.arch.emoji }} ${{ matrix.configuration.name }} - ${{ matrix.python.name }}
     runs-on: ${{ matrix.os.runs-on }}
     timeout-minutes: ${{ matrix.configuration.job_timeout }}
     strategy:
@@ -58,13 +61,14 @@ jobs:
       matrix:
         configuration: ${{ fromJson(inputs.configuration) }}
         os:
-          - emoji: ${{ inputs.emoji }}
+          - emoji: ${{ inputs.os_emoji }}
             matrix: ${{ inputs.matrix }}
             name: ${{ inputs.name }}
             file_name: ${{ inputs.file_name }}
             runs-on: ${{ inputs.runs-on }}
         arch:
           - matrix: ${{ inputs.arch }}
+            emoji: ${{ inputs.arch-emoji }}
         python:
           - name: "3.9"
             file_name: "3.9"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 44d80caec6c8..47f23557903f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -113,7 +113,7 @@ jobs:
     uses: ./.github/workflows/test-single.yml
     needs: configure
     with:
-      emoji: 🍎
+      os-emoji: 🍎
       matrix: macos-intel
       name: macOS Intel
       file_name: macos
@@ -122,12 +122,13 @@ jobs:
       matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
       runs-on: macos-13
       arch: intel
+      arch-emoji: 🌀
   macos-arm:
     if: github.event_name != 'workflow_dispatch' || inputs.run-macos-arm
     uses: ./.github/workflows/test-single.yml
     needs: configure
     with:
-      emoji: 🍎
+      os-emoji: 🍎
       matrix: macos
       name: macOS ARM
       file_name: macos-arm
@@ -136,13 +137,14 @@ jobs:
       matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
       runs-on: macos-14
       arch: arm
+      arch-emoji: 💪
       collect-junit: false
   ubuntu:
     if: github.event_name != 'workflow_dispatch' || inputs.run-linux
     uses: ./.github/workflows/test-single.yml
     needs: configure
     with:
-      emoji: 🐧
+      os-emoji: 🐧
       matrix: ubuntu
       name: Ubuntu
       file_name: ubuntu
@@ -151,13 +153,14 @@ jobs:
       matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
       runs-on: ubuntu-latest
       arch: intel
+      arch-emoji: 🌀
       collect-junit: false
   windows:
     if: github.event_name != 'workflow_dispatch' || inputs.run-windows
     uses: ./.github/workflows/test-single.yml
     needs: configure
     with:
-      emoji: 🪟
+      os-emoji: 🪟
       matrix: windows
       name: Windows
       file_name: windows
@@ -166,6 +169,7 @@ jobs:
       matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
       runs-on: windows-latest
       arch: intel
+      arch-emoji: 🌀
       collect-junit: false
 
   coverage:
diff --git a/.github/workflows/upload-pypi-source.yml b/.github/workflows/upload-pypi-source.yml
index 49ef51795db5..1b2a6e3aeeaf 100644
--- a/.github/workflows/upload-pypi-source.yml
+++ b/.github/workflows/upload-pypi-source.yml
@@ -26,7 +26,7 @@ permissions:
 
 jobs:
   mypy:
-    name: ${{ matrix.os.emoji }} ${{ matrix.check.name }} - ${{ matrix.os.name }} ${{ matrix.arch.name }} ${{ matrix.python.major_dot_minor }}
+    name: ${{ matrix.os.emoji }} ${{ matrix.arch.emoji }} ${{ matrix.check.name }} - ${{ matrix.os.name }} ${{ matrix.python.major_dot_minor }}
     runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
     timeout-minutes: 20
     strategy:
@@ -52,8 +52,10 @@ jobs:
               intel: windows-latest
         arch:
           - name: ARM64
+            emoji: 💪
             matrix: arm
           - name: Intel
+            emoji: 🌀
             matrix: intel
         python:
           - major_dot_minor: "3.9"