diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
deleted file mode 100644
index f6fbec56..00000000
--- a/.github/workflows/build_and_deploy.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: 'Deploy on release tag'
-
-on:
-  push:
-    tags:
-      - v[0-9]+.[0-9]+.[0-9]+\+?r?e?v?*
-      - v20[0-9][0-9].[0-1]?[1470].[0-9]+
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  release-on-tag:
-    uses: balena-os/github-workflows/.github/workflows/build_and_deploy.yml@0192d70429dd7bce1aee056ec3369514f682d48a # v0.0.27
-    with:
-      deployTo: "production"
-    secrets: inherit
diff --git a/.github/workflows/ucm-imx93.yml b/.github/workflows/ucm-imx93.yml
new file mode 100644
index 00000000..275ade14
--- /dev/null
+++ b/.github/workflows/ucm-imx93.yml
@@ -0,0 +1,58 @@
+name: Compulab UCM-iMX93 Devkit
+
+on:
+  # https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#onpushbranchestagsbranches-ignoretags-ignore
+  # https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
+  pull_request:
+    branches:
+      - main
+      - master
+      # ESR branches glob pattern
+      #- 20[0-9][0-9].[0-1]?[1470].x
+  # pull_request_target:
+  #   branches:
+  #     - main
+  #     - master
+  push:
+    tags:
+      # Semver tags glob pattern (includes ESR in format v20YY.MM.PATCH)
+      - v[0-9]+.[0-9]+.[0-9]+\+?r?e?v?*
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+    inputs:
+      force-finalize:
+        description: Force finalize of the build (implicitly enables hostapp and S3 deployments)
+        required: false
+        type: boolean
+        default: false
+      deploy-environment:
+        description: Environment to use for build and deploy
+        required: false
+        type: string
+        default: balena-staging.com
+
+
+jobs:
+  yocto:
+    name: Yocto
+    uses: balena-os/balena-yocto-scripts/.github/workflows/yocto-build-deploy.yml@v1.25.47
+    # Prevent duplicate workflow executions for pull_request (PR) and pull_request_target (PRT) events.
+    # Both PR and PRT will be triggered for the same pull request, whether it is internal or from a fork.
+    # This condition will prevent the workflow from running twice for the same pull request while
+    # still allowing it to run for all other event types.
+    if: (github.event.pull_request.head.repo.full_name == github.repository) == (github.event_name == 'pull_request')
+    secrets: inherit
+    with:
+      machine: ucm-imx93
+      # worker_type defaults to testbot
+      # worker_fleets defaults to balena/testbot-rig,balena/testbot-rig-partners,balena/testbot-rig-x86,balena/testbot-rig-partners-x86
+      test_matrix: >
+        {
+          "test_suite": ["os","cloud","hup"],
+          "environment": ["bm.balena-dev.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' }}
diff --git a/layers/meta-balena b/layers/meta-balena
index e1d709a6..41a79d91 160000
--- a/layers/meta-balena
+++ b/layers/meta-balena
@@ -1 +1 @@
-Subproject commit e1d709a6f00e8dd3271a3c84d9fb6430cedec485
+Subproject commit 41a79d918e5a8b62b88b9e137ce7e47122ca6b28
diff --git a/layers/meta-balena-imx9/recipes-bsp/u-boot/u-boot-compulab_%.bbappend b/layers/meta-balena-imx9/recipes-bsp/u-boot/u-boot-compulab_%.bbappend
index 02384d19..fb7ee17b 100644
--- a/layers/meta-balena-imx9/recipes-bsp/u-boot/u-boot-compulab_%.bbappend
+++ b/layers/meta-balena-imx9/recipes-bsp/u-boot/u-boot-compulab_%.bbappend
@@ -19,6 +19,13 @@ BALENA_UBOOT_DEVICE_TYPES = "usb mmc"
 # revision is used by which balenaOS release
 SRCREV="34382c7df25560904a521d3f62bf5768899c55a2"
 
+# WORKAROUND for unblocking builds, because the
+# old upstream branch has been renamed.
+# This board may need a BSP update after the upstream issue
+# https://github.com/compulab-yokneam/u-boot-compulab/issues/6
+# is clarified
+SRCBRANCH = "to-be-removed/u-boot-compulab_v2022.04"
+
 # Bring in configure step from poky
 # to make sure the merge_config script is called
 # appropriately, otherwise the build will fail