diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ebe77f6..286a1a7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -303,7 +303,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up QEMU
-        if: runner.os == 'Linux' && matrix.architecture == 'arm64'
+        if: matrix.architecture == 'arm64' && runner.os == 'Linux'
         uses: docker/setup-qemu-action@v3
         with:
           platforms: arm64
@@ -325,7 +325,7 @@ jobs:
           path: pypylon-wheels
 
       - name: Set up Python ${{ matrix.python-version }}
-        if: runner.os != 'Linux' && matrix.architecture != 'arm64'
+        if: matrix.architecture != 'arm64' && runner.os != 'Linux'
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
@@ -338,8 +338,8 @@ jobs:
           sudo sed -i 's/^# *\(fr_FR.UTF-8\)/\1/' /etc/locale.gen
           sudo locale-gen
 
-      - name: Run pypylon unit tests for Python ${{ matrix.python-version }}
-        if: runner.os == 'Linux' && matrix.architecture == 'arm64'
+      - name: Run pypylon unit tests for Python ${{ matrix.python-version }} using QEMU
+        if: matrix.architecture == 'arm64' && runner.os == 'Linux'
         uses: addnab/docker-run-action@v3
         with:
           image: arm64v8/python:${{ matrix.python-version }}-slim
@@ -354,7 +354,7 @@ jobs:
             pip install --no-index --find-links pypylon-wheels pypylon
             pytest tests/genicam_tests tests/pylon_tests/emulated
 
-      - name: Run pypylon unit tests for Python ${{ matrix.python-version }}
+      - name: Run pypylon unit tests for Python ${{ matrix.python-version }} without pylon Data Processing
         if: runner.os == 'macOS'
         run: |
           python -m pip install --upgrade pip
@@ -363,7 +363,7 @@ jobs:
           pytest tests/genicam_tests tests/pylon_tests/emulated
 
       - name: Run pypylon unit tests for Python ${{ matrix.python-version }}
-        if: runner.os != 'macOS' && runner.os != 'Linux' && matrix.architecture != 'arm64'
+        if: matrix.architecture != 'arm64' && runner.os != 'macOS'
         run: |
           python -m pip install --upgrade pip
           pip install pytest numpy