diff --git a/.github/config/linux.json b/.github/config/linux.json
index 79ceb0bbd36a..633f86511321 100644
--- a/.github/config/linux.json
+++ b/.github/config/linux.json
@@ -1,5 +1,6 @@
 {
   "docker_service": "build-linux",
+  "bootloader": "linux-x64x11",
   "on_host_test": true,
   "on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt"],
   "platforms": [
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index b15c3d1805f2..4cd3c859c8dc 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -245,10 +245,10 @@ jobs:
         run: echo "COBALT_BOOTLOADER=${{needs.initialize.outputs.bootloader}}" >> $GITHUB_ENV
       # Build bootloader for on-host tests if necessary.
       - name: Bootloader GN
-        if: ${{ needs.initialize.outputs.bootloader != 'null' && matrix.config == 'devel' }}
+        if: ${{ needs.initialize.outputs.bootloader != 'null' && ( matrix.config == 'devel' || matrix.config == 'qa' ) }}
         uses: ./.github/actions/gn
       - name: Build Bootloader
-        if: ${{ needs.initialize.outputs.bootloader != 'null' && matrix.config == 'devel' }}
+        if: ${{ needs.initialize.outputs.bootloader != 'null' && ( matrix.config == 'devel' || matrix.config == 'qa' ) }}
         uses: ./.github/actions/build
       - name: Upload Bootloader On Host Test Artifacts
         if: ${{ needs.initialize.outputs.bootloader != 'null' && matrix.config == 'devel' && needs.initialize.outputs.on_host_test == 'true'}}