diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml
index 2de39c37..f1aa2fe3 100644
--- a/.github/workflows/zephyr.yml
+++ b/.github/workflows/zephyr.yml
@@ -26,6 +26,7 @@ jobs:
         board:
           - pico_plus2/rp2350b/m33
           - native_sim/native/64
+          - b_u585i_iot02a
         app:
           - mini
           - demo
diff --git a/src/samples/demo/zephyr/boards/b_u585i_iot02a.conf b/src/samples/demo/zephyr/boards/b_u585i_iot02a.conf
new file mode 100644
index 00000000..8ff854c0
--- /dev/null
+++ b/src/samples/demo/zephyr/boards/b_u585i_iot02a.conf
@@ -0,0 +1,7 @@
+# @copyright Copyright (c) contributors to Project Ocre,
+# which has been established as Project Ocre a Series of LF Projects, LLC
+#
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_STM32_MEMMAP=y
+CONFIG_OCRE_MERGE_HEX=y
diff --git a/src/samples/demo/zephyr/boards/b_u585i_iot02a.overlay b/src/samples/demo/zephyr/boards/b_u585i_iot02a.overlay
new file mode 100644
index 00000000..f9e7931e
--- /dev/null
+++ b/src/samples/demo/zephyr/boards/b_u585i_iot02a.overlay
@@ -0,0 +1,40 @@
+/**
+ * @copyright Copyright (c) contributors to Project Ocre,
+ * which has been established as Project Ocre a Series of LF Projects, LLC
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+ 
+/* The storage partition will be in the external flash */
+&flash0 {
+    partitions {
+       /delete-node/ partition@f0000;
+    };
+};
+
+&mx25lm51245 { 
+    reg = <0>;
+    size = <DT_SIZE_M(512)>; /* 512 Megabits */
+    #address-cells = <1>;
+    #size-cells = <1>;
+
+    ranges = <0x0 0x70000000 DT_SIZE_M(64)>; /* Ext Flash mem-mapped to 0x70000000 */
+
+    ext_flash: ext-flash@0 {
+        compatible = "soc-nv-flash";
+        reg = <0x0 DT_SIZE_M(64)>;
+        write-block-size = <1>;
+        erase-block-size = <DT_SIZE_K(4)>;
+
+        partitions {
+            compatible = "fixed-partitions";
+            #address-cells = <1>;
+            #size-cells = <1>;
+
+            /* Use the first partition from flash. */
+            storage_partition: partition@0 {
+                reg = <0x0 DT_SIZE_M(64)>;
+            };
+        };
+    };
+};
diff --git a/src/samples/mini/zephyr/boards/b_u585i_iot02a.overlay b/src/samples/mini/zephyr/boards/b_u585i_iot02a.overlay
new file mode 100644
index 00000000..de5bb500
--- /dev/null
+++ b/src/samples/mini/zephyr/boards/b_u585i_iot02a.overlay
@@ -0,0 +1,10 @@
+/**
+ * @copyright Copyright (c) contributors to Project Ocre,
+ * which has been established as Project Ocre a Series of LF Projects, LLC
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+ 
+&storage_partition{
+    reg = <0x000f0000 DT_SIZE_K(512)>;
+};