diff --git a/doc/releases/release-notes-3.7.rst b/doc/releases/release-notes-3.7.rst
index a69aeaf5f8782..4320aa1ad61aa 100644
--- a/doc/releases/release-notes-3.7.rst
+++ b/doc/releases/release-notes-3.7.rst
@@ -851,6 +851,11 @@ Libraries / Subsystems
     for the Mbed TLS's p256-m driver PSA crypto library. This is a Cortex-M SW
     optimized implementation of secp256r1 curve.
 
+* CMSIS-NN
+
+  * CMSIS-NN was updated to v6.0.0 from v4.1.0:
+    https://arm-software.github.io/CMSIS-NN/latest/rev_hist.html
+
 * Random
 
   * Besides the existing :c:func:`sys_rand32_get` function, :c:func:`sys_rand8_get`,
diff --git a/modules/cmsis-nn/CMakeLists.txt b/modules/cmsis-nn/CMakeLists.txt
index 9393a5ff21e06..ec55bafbcfa7a 100644
--- a/modules/cmsis-nn/CMakeLists.txt
+++ b/modules/cmsis-nn/CMakeLists.txt
@@ -33,21 +33,24 @@ if(CONFIG_CMSIS_NN)
   endif()
 
   if(CONFIG_CMSIS_NN_CONVOLUTION)
-    file(GLOB SRC "${CMSIS_NN_DIR}/Source/ConvolutionFunctions/*_s8*.c")
+    file(GLOB SRC_S4 "${CMSIS_NN_DIR}/Source/ConvolutionFunctions/*_s4*.c")
+    file(GLOB SRC_S8 "${CMSIS_NN_DIR}/Source/ConvolutionFunctions/*_s8*.c")
     file(GLOB SRC_S16 "${CMSIS_NN_DIR}/Source/ConvolutionFunctions/*_s16*.c")
-    zephyr_library_sources(${SRC} ${SRC_S16})
+    zephyr_library_sources(${SRC_S4} ${SRC_S8} ${SRC_S16})
   endif()
 
   if(CONFIG_CMSIS_NN_FULLYCONNECTED)
-    file(GLOB SRC "${CMSIS_NN_DIR}/Source/FullyConnectedFunctions/*_s8.c")
+    file(GLOB SRC_S4 "${CMSIS_NN_DIR}/Source/FullyConnectedFunctions/*_s4.c")
+    file(GLOB SRC_S8 "${CMSIS_NN_DIR}/Source/FullyConnectedFunctions/*_s8.c")
     file(GLOB SRC_S16 "${CMSIS_NN_DIR}/Source/FullyConnectedFunctions/*_s16*.c")
-    zephyr_library_sources(${SRC} ${SRC_S16})
+    zephyr_library_sources(${SRC_S4} ${SRC_S8} ${SRC_S16})
   endif()
 
   if(CONFIG_CMSIS_NN_NNSUPPORT)
-    file(GLOB SRC "${CMSIS_NN_DIR}/Source/NNSupportFunctions/*_s8*.c")
+    file(GLOB SRC_S4 "${CMSIS_NN_DIR}/Source/NNSupportFunctions/*_s4*.c")
+    file(GLOB SRC_S8 "${CMSIS_NN_DIR}/Source/NNSupportFunctions/*_s8*.c")
     file(GLOB SRC_S16 "${CMSIS_NN_DIR}/Source/NNSupportFunctions/*_s16*.c")
-    zephyr_library_sources(${SRC} ${SRC_S16}
+    zephyr_library_sources(${SRC_S4} ${SRC_S8} ${SRC_S16}
       ${CMSIS_NN_DIR}/Source/NNSupportFunctions/arm_nntables.c
       ${CMSIS_NN_DIR}/Source/NNSupportFunctions/arm_q7_to_q15_with_offset.c
       ${CMSIS_NN_DIR}/Source/NNSupportFunctions/arm_s8_to_s16_unordered_with_offset.c)
diff --git a/modules/tflite-micro/CMakeLists.txt b/modules/tflite-micro/CMakeLists.txt
index ce1cd370c1afd..50a3935577453 100644
--- a/modules/tflite-micro/CMakeLists.txt
+++ b/modules/tflite-micro/CMakeLists.txt
@@ -51,13 +51,13 @@ if(CONFIG_TENSORFLOW_LITE_MICRO)
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/test_helper_custom_ops.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/recording_micro_allocator.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/micro_time.cc
-    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/micro_string.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/micro_profiler.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/micro_utils.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/flatbuffer_utils.cc
-    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/micro_graph.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/mock_micro_graph.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/micro_interpreter.cc
+    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/micro_interpreter_context.cc
+    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/micro_interpreter_graph.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/micro_allocator.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/micro_context.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/micro_log.cc
@@ -83,7 +83,6 @@ if(CONFIG_TENSORFLOW_LITE_MICRO)
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/core/api/flatbuffer_conversions.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/core/api/error_reporter.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/core/api/tensor_utils.cc
-    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/core/api/op_resolver.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/schema/schema_utils.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/activations.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/activations_common.cc
diff --git a/samples/modules/tflite-micro/hello_world/prj.conf b/samples/modules/tflite-micro/hello_world/prj.conf
index c4652d4f7c394..80c7d59270218 100644
--- a/samples/modules/tflite-micro/hello_world/prj.conf
+++ b/samples/modules/tflite-micro/hello_world/prj.conf
@@ -16,3 +16,4 @@ CONFIG_CPP=y
 CONFIG_STD_CPP17=y
 CONFIG_TENSORFLOW_LITE_MICRO=y
 CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_REQUIRES_FLOAT_PRINTF=y
diff --git a/samples/modules/tflite-micro/tflm_ethosu/prj.conf b/samples/modules/tflite-micro/tflm_ethosu/prj.conf
index e4d4947b2981b..a1961668b0e5d 100644
--- a/samples/modules/tflite-micro/tflm_ethosu/prj.conf
+++ b/samples/modules/tflite-micro/tflm_ethosu/prj.conf
@@ -6,3 +6,4 @@ CONFIG_TENSORFLOW_LITE_MICRO=y
 CONFIG_ARM_ETHOS_U=y
 CONFIG_HEAP_MEM_POOL_SIZE=16384
 CONFIG_LOG=y
+CONFIG_REQUIRES_FLOAT_PRINTF=y
diff --git a/submanifests/optional.yaml b/submanifests/optional.yaml
index a6a9048d17f4e..1d387e2c30442 100644
--- a/submanifests/optional.yaml
+++ b/submanifests/optional.yaml
@@ -46,7 +46,7 @@ manifest:
       groups:
         - optional
     - name: tflite-micro
-      revision: 1a34dcab41e7e0e667db72d6a40999c1ec9c510c
+      revision: 48613f7ba1ffbda46ad771a77a35408f48f922e9
       path: optional/modules/lib/tflite-micro
       repo-path: tflite-micro
       remote: upstream
diff --git a/tests/lib/cmsis_nn/src/main.c b/tests/lib/cmsis_nn/src/main.c
index 3eb7c200590f3..c7dbe3bc58ed4 100644
--- a/tests/lib/cmsis_nn/src/main.c
+++ b/tests/lib/cmsis_nn/src/main.c
@@ -170,6 +170,7 @@ ZTEST(cmsis_nn, test_convolve)
 	input_dims.c = CONV_4_IN_CH;
 	filter_dims.w = CONV_4_FILTER_X;
 	filter_dims.h = CONV_4_FILTER_Y;
+	filter_dims.c = CONV_4_IN_CH;
 	output_dims.w = CONV_4_OUTPUT_W;
 	output_dims.h = CONV_4_OUTPUT_H;
 	output_dims.c = CONV_4_OUT_CH;
diff --git a/west.yml b/west.yml
index 386efbe778bb2..d88f0a8911d43 100644
--- a/west.yml
+++ b/west.yml
@@ -124,7 +124,7 @@ manifest:
       revision: 6489e771e9c405f1763b52d64a3f17a1ec488ace
       path: modules/lib/cmsis-dsp
     - name: cmsis-nn
-      revision: 0c8669d81381ccf3b1a01d699f3b68b50134a99f
+      revision: ea987c1ca661be723de83bd159aed815d6cbd430
       path: modules/lib/cmsis-nn
     - name: edtt
       revision: 8d7b543d4d2f2be0f78481e4e1d8d73a88024803