diff --git a/.github/workflows/owa5x.yml b/.github/workflows/owa5x.yml
index 84c0726d..558a061c 100644
--- a/.github/workflows/owa5x.yml
+++ b/.github/workflows/owa5x.yml
@@ -30,6 +30,11 @@ on:
         required: false
         type: string
         default: balena-staging.com
+      meta-balena-ref:
+        description: meta-balena ref if not the currently pinned version
+        required: false
+        type: string
+        default: ''
 
 jobs:
   yocto:
@@ -43,7 +48,15 @@ jobs:
     secrets: inherit
     with:
       machine: owa5x
+      test_matrix: >
+        {
+          "test_suite": ["os","cloud","hup"],
+          "environment": ["balena-cloud.com"],
+          "runs_on": [["ubuntu-latest"]]
+        }
       # Allow manual workflow runs to force finalize without checking previous test runs
       force-finalize: ${{ inputs.force-finalize || false }}
       # Default to balena-staging.com for workflow dispatch, but balena-cloud.com for other events
       deploy-environment: ${{ inputs.deploy-environment || 'balena-cloud.com' }}
+      # Allow overriding the meta-balena ref for workflow dispatch events
+      meta-balena-ref: ${{ inputs.meta-balena-ref || '' }}
diff --git a/layers/meta-balena-5x-owa/recipes-core/pmsrv/files/do_not_set_hostname.patch b/layers/meta-balena-5x-owa/recipes-core/pmsrv/files/do_not_set_hostname.patch
new file mode 100644
index 00000000..3d1158aa
--- /dev/null
+++ b/layers/meta-balena-5x-owa/recipes-core/pmsrv/files/do_not_set_hostname.patch
@@ -0,0 +1,13 @@
+Index: 1.0.27-r0/pmsrv.json
+===================================================================
+--- 1.0.27-r0.orig/pmsrv.json
++++ 1.0.27-r0/pmsrv.json
+@@ -1,7 +1,7 @@
+ {
+     "name": "pmsrv",
+     "reset_lines": 20,
+-    "set_hostname": 1,
++    "set_hostname": 0,
+     "set_default": 1,
+     "set_time": 0,
+     "secure_time": 1,
diff --git a/layers/meta-balena-5x-owa/recipes-core/pmsrv/pmsrv_%.bbappend b/layers/meta-balena-5x-owa/recipes-core/pmsrv/pmsrv_%.bbappend
new file mode 100644
index 00000000..f8f344f6
--- /dev/null
+++ b/layers/meta-balena-5x-owa/recipes-core/pmsrv/pmsrv_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS:append := ":${THISDIR}/files"
+
+SRC_URI:append = " file://do_not_set_hostname.patch"