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)}"