diff --git a/.github/workflows/test-dispatch.yaml b/.github/workflows/test-dispatch.yaml
index 68261453959c..ad360bf683f8 100644
--- a/.github/workflows/test-dispatch.yaml
+++ b/.github/workflows/test-dispatch.yaml
@@ -9,9 +9,21 @@ on:
         options:
           - grayskull
           - wormhole_b0
-      runner-label:
+      hw-config:
         required: true
-        type: string
+        type: choice
+        options:
+          - E150
+          - N150
+          - N300
+          - config-t3000
+          - config-tg
+          - config-tgg
+          - BH
+      runner-label:
+        required: false
+        type: array
+        default: '["in-service"]'
       build-type:
         required: false
         type: choice
@@ -50,9 +62,9 @@ jobs:
       ARCH_NAME: ${{ inputs.arch }}
       LD_LIBRARY_PATH: ${{ github.workspace }}/build/lib
     environment: dev
-    runs-on: 
+    runs-on:
       - ${{ inputs.runner-label }}
-      - "in-service"
+      - ${{ inputs.hw-config }}
     steps:
       - uses: tenstorrent-metal/metal-workflows/.github/actions/checkout-with-submodule-lfs@v2.0.0
       - name: Ensure weka mount is active