diff --git a/toolchain_ARMCLANG.cmake b/toolchain_ARMCLANG.cmake
index 403a9c1..5f94c17 100644
--- a/toolchain_ARMCLANG.cmake
+++ b/toolchain_ARMCLANG.cmake
@@ -86,10 +86,9 @@
     if (DEFINED TFM_SYSTEM_PROCESSOR)
         set(CMAKE_SYSTEM_PROCESSOR       ${TFM_SYSTEM_PROCESSOR})
 
-        if (DEFINED TFM_SYSTEM_MVE)
-            if(NOT TFM_SYSTEM_MVE)
-                string(APPEND CMAKE_SYSTEM_PROCESSOR "+nomve")
-            endif()
+        if (TFM_SYSTEM_ARCHITECTURE STREQUAL "armv8.1-m.main")
+            message(WARNING "MVE is not yet supported using ARMCLANG")
+            string(APPEND CMAKE_SYSTEM_PROCESSOR "+nomve")
         endif()
 
         if (DEFINED TFM_SYSTEM_DSP)
@@ -109,10 +108,6 @@
         # Modifiers are additive instead of subtractive (.fp Vs .no_fp)
         if (TFM_SYSTEM_DSP)
             string(APPEND CMAKE_ASM_CPU_FLAG ".dsp")
-        else()
-            if (TFM_SYSTEM_MVE)
-                string(APPEND CMAKE_ASM_CPU_FLAG ".mve")
-            endif()
         endif()
     endif()
 
@@ -129,10 +124,9 @@
     set(CMAKE_C_COMPILER_TARGET      arm-${CROSS_COMPILE})
     set(CMAKE_ASM_COMPILER_TARGET    arm-${CROSS_COMPILE})
 
-    if (DEFINED TFM_SYSTEM_MVE)
-        if(NOT TFM_SYSTEM_MVE)
-            string(APPEND CMAKE_SYSTEM_ARCH "+nomve")
-        endif()
+    # MVE is currently not supported in case of armclang
+    if (TFM_SYSTEM_ARCHITECTURE STREQUAL "armv8.1-m.main")
+        string(APPEND CMAKE_SYSTEM_ARCH "+nomve")
     endif()
 
     if (DEFINED TFM_SYSTEM_DSP)