diff --git a/.dictionary b/.dictionary
index cab48e1c0a086ec4b196c7f660eaee7193156056..f99448e2d411f8f011405da26383f21fc8e009c2 100644
--- a/.dictionary
+++ b/.dictionary
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: <text>Copyright 2023-2024 Arm Limited and/or its
+# SPDX-FileCopyrightText: <text>Copyright 2023-2025 Arm Limited and/or its
 # affiliates <open-source-office@arm.com></text>
 #
 # SPDX-License-Identifier: MIT
@@ -39,6 +39,7 @@ FILESEXTRAPATHS
 flashfw
 fstype
 FSTYPES
+fvpconf
 fvps
 gcsections
 gettext
@@ -108,6 +109,7 @@ TF-A
 THISDIR
 TOTALIMAGES
 udev
+uefiimg
 unitdir
 unpackdir
 upstreamed
@@ -117,6 +119,7 @@ util
 utils
 VIRT
 wchar
+wic
 WIDEC
 workdir
 XNVM
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b9d5af1c630f1f65bebbbb2e4d90b34920ee4fb..76802652b48f94a08a56442cebae9edb48777353 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: <text>Copyright 2023-2024 Arm Limited and/or its
+# SPDX-FileCopyrightText: <text>Copyright 2023-2025 Arm Limited and/or its
 # affiliates <open-source-office@arm.com></text>
 #
 # SPDX-License-Identifier: MIT
@@ -13,8 +13,8 @@ variables:
   META_CASSINI_TARGET_BRANCH:
     value: none
     description: Comma separated list of meta-cassini branch to trigger
-                 (none, main, scarthgap-dev, nanbield-dev,
-                 mickledore-dev, kirkstone-dev)
+                 (none, main, styhead-dev, scarthgap-dev,
+                  kirkstone-dev)
   META_CASSINI_BUILD_IMAGE:
     value: all-images
     description: Comma separated list of images to build
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index 8da67b0262e3367d3ee78142ecb02dc0e91a1791..bc7dd47081e3583af9f7f788f48e61bb101a64b6 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: <text>Copyright 2023-2024 Arm Limited and/or its
+# SPDX-FileCopyrightText: <text>Copyright 2023-2025 Arm Limited and/or its
 # affiliates <open-source-office@arm.com></text>
 #
 # SPDX-License-Identifier: MIT
@@ -60,15 +60,12 @@
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"'
       variables:
         META_CASSINI_TARGET_BRANCH: 'main'
+    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "styhead"'
+      variables:
+        META_CASSINI_TARGET_BRANCH: 'styhead-dev'
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "scarthgap"'
       variables:
         META_CASSINI_TARGET_BRANCH: 'scarthgap-dev'
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "nanbield"'
-      variables:
-        META_CASSINI_TARGET_BRANCH: 'nanbield-dev'
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "mickledore"'
-      variables:
-        META_CASSINI_TARGET_BRANCH: 'mickledore-dev'
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "kirkstone"'
       variables:
         META_CASSINI_TARGET_BRANCH: 'kirkstone-dev'
diff --git a/conf/machine/include/corstone1000-fvp-cassini-extra-settings.inc b/conf/machine/include/corstone1000-fvp-cassini-extra-settings.inc
index b38448141dfaa61af7d688542d39449aa02e4ef0..ef4268a9274b3690f41f7035845d3c10b9c2627d 100644
--- a/conf/machine/include/corstone1000-fvp-cassini-extra-settings.inc
+++ b/conf/machine/include/corstone1000-fvp-cassini-extra-settings.inc
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: <text>Copyright 2023-2024 Arm Limited and/or its
+# SPDX-FileCopyrightText: <text>Copyright 2023-2025 Arm Limited and/or its
 # affiliates <open-source-office@arm.com></text>
 #
 # SPDX-License-Identifier: MIT
@@ -8,3 +8,9 @@ include conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc
 # FVP parameters
 # Setup the second MMC card
 FVP_CONFIG[board.msd_mmc_2.diagnostics] ?= "0"
+
+IMAGE_EXTENSION = "${@bb.utils.contains('VIRTUAL-RUNTIME_ota_update', \
+                            'mender-ota', \
+                            'uefiimg', 'wic', d)}"
+
+FVP_CONFIG[board.msd_mmc.p_mmc_file] = "${IMAGE_NAME}.${IMAGE_EXTENSION}"
diff --git a/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc b/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc
index 4f7d52ed616283c3cb424eabb48fe7f1dc17861a..6f60063feb0ef0ef08e15e5847a0162e52977a89 100644
--- a/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc
+++ b/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: <text>Copyright 2023-2024 Arm Limited and/or its
+# SPDX-FileCopyrightText: <text>Copyright 2023-2025 Arm Limited and/or its
 # affiliates <open-source-office@arm.com></text>
 #
 # SPDX-License-Identifier: MIT
@@ -9,3 +9,11 @@ IMAGE_INSTALL:append:cassini = " wait-online"
 # Since the host has two stage booting, we need to ensure we
 # only get a single ip address for the same MAC incase of reboot
 IMAGE_INSTALL:append:cassini = " send-no-hostname"
+
+# Mender configuration
+INHERIT:remove:firmware = " ${@bb.utils.contains('VIRTUAL-RUNTIME_ota_update',\
+        'mender-ota', 'mender-maybe-setup', '',d)}"
+MENDER_EFI_LOADER:firmware = ""
+FIRMWARE_BINARIES:remove:pn-firmware-deploy-image = " ${@bb.utils.contains(\
+    'VIRTUAL-RUNTIME_ota_update', 'mender-ota', \
+    ' corstone1000_capsule_cert.crt corstone1000_capsule_key.key', '',d)}"