diff --git a/boards/b_u585i_iot02a.conf b/boards/b_u585i_iot02a.conf
index 90d47674..c273b586 100644
--- a/boards/b_u585i_iot02a.conf
+++ b/boards/b_u585i_iot02a.conf
@@ -1,5 +1,6 @@
 # Memory configuration and sizes
-CONFIG_ARM_MPU=y
+CONFIG_ARM_MPU=n
+CONFIG_FPU=y
 CONFIG_MAIN_STACK_SIZE=8192
 CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=-1
 
diff --git a/src/shared/platform/posix/ocre_internal.cmake b/src/shared/platform/posix/ocre_internal.cmake
index 675dbb3e..f37a8480 100644
--- a/src/shared/platform/posix/ocre_internal.cmake
+++ b/src/shared/platform/posix/ocre_internal.cmake
@@ -36,7 +36,7 @@ endif ()
 set (WAMR_BUILD_PLATFORM "linux")
 set (WAMR_BUILD_INTERP 1)
 set (WAMR_BUILD_FAST_INTERP 0)
-set (WAMR_BUILD_AOT 0)
+set (WAMR_BUILD_AOT 1)
 set (WAMR_BUILD_JIT 0)
 set (WAMR_BUILD_LIBC_BUILTIN 0)
 set (WAMR_BUILD_LIBC_WASI 1)
diff --git a/src/shared/platform/zephyr/ocre_internal.cmake b/src/shared/platform/zephyr/ocre_internal.cmake
index cccf6375..cdf9c368 100644
--- a/src/shared/platform/zephyr/ocre_internal.cmake
+++ b/src/shared/platform/zephyr/ocre_internal.cmake
@@ -8,23 +8,32 @@ zephyr_compile_options(-DVERSION_BUILD_MACHINE="${BUILD_MACHINE}")
 message("BUILD_INFO: ${BUILD_INFO}")
 zephyr_compile_options(-DVERSION_BUILD_INFO="${BUILD_INFO}")
 
-# Determine the ISA of the target and set appropriately
-if (DEFINED CONFIG_ISA_THUMB2)
-    set(TARGET_ISA THUMB)
+if (CONFIG_CPU_CORTEX_M33 OR CONFIG_CPU_CORTEX_M35P OR CONFIG_CPU_CORTEX_M55 OR CONFIG_CPU_CORTEX_M85)
+    # ARMv8-M Mainline (Cortex-M33, M35P, M55, M85)
+    set (TARGET_ISA THUMBV8M)
+elseif (CONFIG_CPU_CORTEX_M23)
+    # ARMv8-M Baseline (Cortex-M23)
+    set (TARGET_ISA THUMBV8M)
+elseif (CONFIG_CPU_CORTEX_M7 OR CONFIG_CPU_CORTEX_M4)
+    # ARMv7E-M (Cortex-M4, M7)
+    set (TARGET_ISA THUMBV7EM)
+elseif (DEFINED CONFIG_ISA_THUMB2)
+    # Generic Thumb-2
+    set (TARGET_ISA THUMB)
 elseif (DEFINED CONFIG_ISA_ARM)
-    set(TARGET_ISA ARM)
+    set (TARGET_ISA ARM)
 elseif (DEFINED CONFIG_X86)
-    set(TARGET_ISA X86_32)
+    set (TARGET_ISA X86_32)
 elseif (DEFINED CONFIG_XTENSA)
-    set(TARGET_ISA XTENSA)
+    set (TARGET_ISA XTENSA)
 elseif (DEFINED CONFIG_RISCV)
-    set(TARGET_ISA RISCV32)
+    set (TARGET_ISA RISCV32)
 elseif (DEFINED CONFIG_ARCH_POSIX)
-    set(TARGET_ISA X86_32)  
+    set (TARGET_ISA X86_32)  
 else ()
-    message(FATAL_ERROR "Unsupported ISA: ${CONFIG_ARCH}")
+    message (FATAL_ERROR "Unsupported ISA: ${CONFIG_ARCH}")
 endif ()
-message("TARGET ISA: ${TARGET_ISA}")
+message(STATUS "TARGET ISA: ${TARGET_ISA}")
 
 add_compile_options(-O0 -Wno-unknown-attributes)
 
@@ -33,7 +42,7 @@ set(WAMR_BUILD_PLATFORM "zephyr")
 set(WAMR_BUILD_TARGET ${TARGET_ISA})
 set(WAMR_BUILD_INTERP 1)
 set(WAMR_BUILD_FAST_INTERP 0)
-set(WAMR_BUILD_AOT 0)
+set(WAMR_BUILD_AOT 1)
 set(WAMR_BUILD_JIT 0)
 set(WAMR_BUILD_LIBC_BUILTIN 0)
 set(WAMR_BUILD_LIBC_WASI 1)