diff --git a/.github/workflows/generic-amd.yml b/.github/workflows/generic-amd.yml
new file mode 100644
index 000000000..8aec0b3ec
--- /dev/null
+++ b/.github/workflows/generic-amd.yml
@@ -0,0 +1,30 @@
+name: generic-amd64
+
+on:
+  # With these triggers the Yocto jobs will run
+  # in parallel with the Flowzone jobs, which is fine for now
+  # and allows us to better control what we want to test and when.
+  # It is expected that Flowzone could fail, but yocto jobs will run.
+  pull_request:
+    types: [opened, synchronize, closed]
+    branches:
+      - "main"
+      - "master"
+  pull_request_target:
+    types: [opened, synchronize, closed]
+    branches:
+      - "main"
+      - "master"
+
+jobs:
+  yocto:
+    name: Yocto
+    uses: balena-os/balena-yocto-scripts/.github/workflows/yocto-build-deploy.yml@cb807e274e6a130d861a3b305a358f34e89cd31e
+    secrets: inherit
+    with:
+      machine: generic-amd64
+      test-workers: qemu
+      # Needed for testing - deafults to production
+      environment: staging
+      # Needed for testing as this meta balena commit has the test suite split into 3
+      meta-balena-ref: 4ecd7852f4eb0cd204e31cf3b8634c168782ce46
\ No newline at end of file
diff --git a/.github/workflows/genericx86-64.yml b/.github/workflows/genericx86-64.yml
index 7edc33e88..05f5fd46a 100644
--- a/.github/workflows/genericx86-64.yml
+++ b/.github/workflows/genericx86-64.yml
@@ -27,4 +27,4 @@ jobs:
       # Needed for testing - deafults to production
       environment: staging
       # Needed for testing as this meta balena commit has the test suite split into 3
-      meta-balena-ref: f2a99b11212c2e3eed74dbc26abc5cf96d3b2726
\ No newline at end of file
+      meta-balena-ref: 4ecd7852f4eb0cd204e31cf3b8634c168782ce46
\ No newline at end of file
diff --git a/.github/workflows/intel-nuc.yml b/.github/workflows/intel-nuc.yml
index 232bcccbc..7da64fe33 100644
--- a/.github/workflows/intel-nuc.yml
+++ b/.github/workflows/intel-nuc.yml
@@ -26,4 +26,4 @@ jobs:
       # Needed for testing - deafults to production
       environment: staging
       # Needed for testing as this meta balena commit has the test suite split into 3
-      meta-balena-ref: f2a99b11212c2e3eed74dbc26abc5cf96d3b2726
\ No newline at end of file
+      meta-balena-ref: 4ecd7852f4eb0cd204e31cf3b8634c168782ce46
\ No newline at end of file