diff --git a/.github/workflows/generic-amd64.yml b/.github/workflows/generic-amd64.yml
index b64fdf314..8ad23a3d1 100644
--- a/.github/workflows/generic-amd64.yml
+++ b/.github/workflows/generic-amd64.yml
@@ -56,5 +56,6 @@ jobs:
         {
           "test_suite": ["os","cloud","hup"],
           "environment": ["bm.balena-dev.com"],
-          "worker_type": ["qemu"]
+          "worker_type": ["qemu"],
+          "runs_on": [["self-hosted", "X64", "kvm"]]
         }
diff --git a/.github/workflows/yocto-build-deploy.yml b/.github/workflows/yocto-build-deploy.yml
index f55d4dee6..c73463e87 100644
--- a/.github/workflows/yocto-build-deploy.yml
+++ b/.github/workflows/yocto-build-deploy.yml
@@ -41,7 +41,8 @@ on:
         default: >
           [
             "self-hosted",
-            "X64"
+            "X64",
+            "16cpu"
           ]
       device-repo:
         description: balenaOS device repository (owner/repo)
@@ -92,8 +93,13 @@ on:
         required: false
         type: boolean
         default: ${{ github.event_name == 'push' }} # This determines if we want to check the results of the merge PR - we only want to do it when a new tag is made
+<<<<<<< HEAD
       # FIXME: remove this input and set "test_matrix: {}" to skip tests. The open PR event type check can be moved to the job conditions.
       # Additionally, we may want to change the default test_matrix to {} and make tests opt-in.
+=======
+      # FIXME: remove this input and set "test_matrix: []" to skip tests. The open PR event type check can be moved to the job conditions.
+      # Additionally, we may want to change the default test_matrix to [] and make tests opt-in.
+>>>>>>> 25f10e3 (Support runner selection in the test matrix)
       run-tests:
         required: false
         type: boolean
@@ -136,6 +142,7 @@ on:
       # - worker_type: The worker type to use for testing. The valid worker types are `qemu` and `testbot`. The default worker type is `testbot`
       # - worker_fleets: The testbot fleets for finding available Leviathan workers. Not used for QEMU workers. Can accept a list of apps separated by commas, no spaces in between
       # - test_org: The organization to use for testing cloud functionality. This default org is `testbot`
+      # - runs_on: A JSON array of runner labels to use for the job(s). For qemu workers use the labels `["self-hosted", "X64", "kvm"]`.
       # To use specific settings for each test job, create an include array like this...
       # {"include": [
       #   {
@@ -145,19 +152,21 @@ on:
       #   {
       #     "test_suite": "cloud",
       #     "environment": "balena-cloud.com",
-      #     "worker_type": "qemu"
+      #     "test_org": "testbot"
       #   },
       #   {
       #     "test_suite": "hup",
       #     "environment": "balena-cloud.com",
-      #     "worker_type": "qemu"
+      #     "worker_type": "qemu",
+      #     "runs_on": ["self-hosted", "X64", "kvm"]
       #   }
       # ]}
       # Otherwise for a combinatorial matrix (the default) just provide values like this to have the matrix expanded...
       # {
       #   "test_suite": ["os","cloud","hup"],
       #   "environment": ["bm.balena-dev.com"],
-      #   "worker_type": ["qemu","testbot"]
+      #   "worker_type": ["qemu","testbot"],
+      #   "runs_on": [["self-hosted", "X64", "kvm"]]
       # }
       test_matrix:
         description: "JSON Leviathan test matrix to use for testing. If not provided, the default testbot matrix will be used."
@@ -982,7 +991,7 @@ jobs:
   test:
     name: Test
     needs: build
-    runs-on: ${{ fromJSON(inputs.runs-on) }}
+    runs-on: ${{ fromJSON(matrix.runs_on || '["ubuntu-22.04"]') }}
     if: inputs.run-tests == true
     environment: ${{ matrix.environment }}