diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml
index 4e4383925..10aaf7d74 100644
--- a/.github/workflows/flowzone.yml
+++ b/.github/workflows/flowzone.yml
@@ -31,31 +31,7 @@ jobs:
         ghcr.io/balena-os/balena-yocto-scripts
       bake_targets: yocto-build-env,balena-push-env
 
-  # yocto-build:
-  #   name: yocto-build
-  #   uses: ./.github/workflows/yocto-build-deploy.yml
-  #   needs: flowzone
-  #   secrets: inherit
-  #   with:
-  #     # runs-on: '[ "ubuntu-latest" ]'
-  #     environment: staging
-  #     device-repo: balena-os/balena-generic
-  #     device-repo-ref: master
-  #     yocto-scripts-ref: ${{ github.event.pull_request.head.sha || github.sha }}
-  #     machine: generic-amd64
-  #     sign-image: false
-  #     os-dev: false
-  #     deploy-s3: true
-  #     deploy-hostapp: true
-  #     deploy-ami: true
-  #     deploy-esr: false
-  #     finalize-hostapp: "no"
-  #     run-tests: true
-  #     test-environment: balenaos-balenamachine
-  #     test-workers: qemu
-  #     meta-balena-ref: 3755d5fd36470a1e2f2a5e731497a2e1884f4897
-  
-  yocto-build-test:
+  yocto-build:
     name: yocto-build
     uses: ./.github/workflows/yocto-build-deploy.yml
     needs: flowzone
@@ -63,10 +39,10 @@ jobs:
     with:
       # runs-on: '[ "ubuntu-latest" ]'
       environment: staging
-      device-repo: balena-os/balena-raspberrypi
+      device-repo: balena-os/balena-generic
       device-repo-ref: master
       yocto-scripts-ref: ${{ github.event.pull_request.head.sha || github.sha }}
-      machine: raspberrypi3
+      machine: generic-amd64
       sign-image: false
       os-dev: false
       deploy-s3: true
@@ -76,10 +52,9 @@ jobs:
       finalize-hostapp: "no"
       run-tests: true
       test-environment: balenaos-balenamachine
-      test-workers: testbot
+      test-workers: qemu
       meta-balena-ref: 3755d5fd36470a1e2f2a5e731497a2e1884f4897
-
-
+  
   # depends on Flowzone having already published the helper images
   # yocto-build:
   #   name: yocto-build