diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b82cb54fa..ac519143f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -73,13 +73,29 @@ jobs:
         run: >
           sudo apt install qt6-{base-{dev{,-tools},doc-dev},connectivity-{dev,doc-html},l10n-tools,tools-dev{,-tools}}
       - name: Install online Qt version
-        if: contains(matrix.qt, '.') # ie if not using Ubuntu's Qt5/Qt6.
+        if: contains(matrix.qt, '.') && matrix.arch != 'arm64' # ie if not using Ubuntu's Qt5/Qt6.
+        uses: 'jurplel/install-qt-action@v4'
+        with:
+          version: ${{ matrix.qt }}
+          host: linux${{ matrix.arch == 'arm64' && '_arm64' || '' }}
+          modules: ${{ startsWith(matrix.qt, '6') && 'qtconnectivity' || '' }}
+          setup-python: false
+          documentation: true
+          doc-archives: >-
+            ${{ (startsWith(matrix.qt, '5.10.') || startsWith(matrix.qt, '5.11.')) && 'qt' ||
+                (startsWith(matrix.qt, '5') && 'qtcore qtbluetooth' || 'qtcore') }}
+          doc-modules: ${{ startsWith(matrix.qt, '6') && 'qtbluetooth' || '' }}
+          # \todo Use aqtinstall HEAD for Qt 6.8.1 and 6.9.0 support, until the fix for #843 is released (presumably in
+          # aqtinstall 3.1.22. See https://github.com/miurahr/aqtinstall/issues/843
+          aqtsource: >-
+            ${{ (startsWith(matrix.qt, '6.8') || startsWith(matrix.qt, '6.9')) &&
+                 'git+https://github.com/miurahr/aqtinstall.git' || '' }}
+      - name: Install online Qt version for arm64
         # \todo Revert to only using jurplel's action when issue #248 is resolved.
         #       Note, can probably remove the host property below at the same time.
         # \todo See https://github.com/jurplel/install-qt-action/issues/248
-        uses: >-
-          ${{ matrix.arch == 'arm64' && 'jdpurcell/install-qt-action@b45c67aaa9e0ea77e59a7031ec14a12d5ddf4b35'
-                                     || 'jurplel/install-qt-action@v4' }}
+        if: contains(matrix.qt, '.') && matrix.arch == 'arm64' # ie if not using Ubuntu's Qt5/Qt6.
+        uses: jdpurcell/install-qt-action@b45c67aaa9e0ea77e59a7031ec14a12d5ddf4b35
         with:
           version: ${{ matrix.qt }}
           host: linux${{ matrix.arch == 'arm64' && '_arm64' || '' }}