diff --git a/tutorials/zephyr/Makefile b/tutorials/zephyr/Makefile
index 5652106e..2e248a1c 100644
--- a/tutorials/zephyr/Makefile
+++ b/tutorials/zephyr/Makefile
@@ -25,12 +25,13 @@ endif
 update:
 	$(DOCKER) $(REPO) /bin/sh -c 'cd $(DOCKER_ZEPHYR_PATH) && west update'
 
+# starting from 4.2.0, Zephyr uses CMSIS 6 https://docs.zephyrproject.org/latest/releases/migration-guide-4.2.html#cmsis
 minify:
 ifeq ("$(REVNO)","--mr v3.7-branch")
 	$(YQ) -i eval '(.manifest.defaults, .manifest.remotes, .manifest.projects[] | select(.name == "cmsis" or .name == "hal_stm32" or .name == "mbedtls" or .name == "mcuboot" or .name == "picolibc" | del(.null) ), .manifest.self) as $$i ireduce({};setpath($$i | path; $$i)) | del(.manifest.projects.[].null) | del(..|select(length==0))' zephyrproject/zephyr/west.yml
 endif
-#ifneq ("$(REVNO)","--mr v3.7-branch")
-#	$(YQ) -i eval '(.manifest.defaults, .manifest.remotes, .manifest.group-filter, .manifest.projects[] | select(.name == "cmsis" or .name == "hal_stm32" or .name == "mbedtls" or .name == "mcuboot" or .name == "picolibc" | del(.null) ), .manifest.self) as $$i ireduce({};setpath($$i | path; $$i)) | del(.manifest.projects.[].null) | del(..|select(length==0))' zephyrproject/zephyr/west.yml
-#endif
+ifneq ("$(REVNO)","--mr v3.7-branch")
+	$(YQ) -i eval '(.manifest.defaults, .manifest.remotes, .manifest.group-filter, .manifest.projects[] | select(.name == "cmsis_6" or .name == "hal_stm32" or .name == "mbedtls" or .name == "mcuboot" or .name == "picolibc" | del(.null) ), .manifest.self) as $$i ireduce({};setpath($$i | path; $$i)) | del(.manifest.projects.[].null) | del(..|select(length==0))' zephyrproject/zephyr/west.yml
+endif
 
 zephyr: init minify update
diff --git a/tutorials/zephyr/device-dashboard/src/main.c b/tutorials/zephyr/device-dashboard/src/main.c
index c6a5c25e..ca5f6019 100644
--- a/tutorials/zephyr/device-dashboard/src/main.c
+++ b/tutorials/zephyr/device-dashboard/src/main.c
@@ -11,7 +11,8 @@
 K_SEM_DEFINE(run, 0, 1);
 
 static void zeh(struct net_mgmt_event_callback *cb,
-#if ZEPHYR_VERSION_CODE < 0x40000
+// https://docs.zephyrproject.org/latest/releases/migration-guide-4.2.html#networking
+#if ZEPHYR_VERSION_CODE < 0x40200
                 uint32_t mgmt_event,
 #else
                 uint64_t mgmt_event,
diff --git a/tutorials/zephyr/http-client/src/main.c b/tutorials/zephyr/http-client/src/main.c
index e7039e9b..d6bbf67c 100644
--- a/tutorials/zephyr/http-client/src/main.c
+++ b/tutorials/zephyr/http-client/src/main.c
@@ -93,7 +93,8 @@ static void timer_fn(void *arg) {
 K_SEM_DEFINE(run, 0, 1);
 
 static void zeh(struct net_mgmt_event_callback *cb,
-#if ZEPHYR_VERSION_CODE < 0x40000
+// https://docs.zephyrproject.org/latest/releases/migration-guide-4.2.html#networking
+#if ZEPHYR_VERSION_CODE < 0x40200
                 uint32_t mgmt_event,
 #else
                 uint64_t mgmt_event,
diff --git a/tutorials/zephyr/http-server/src/main.c b/tutorials/zephyr/http-server/src/main.c
index 1dd7bb44..85f147e7 100644
--- a/tutorials/zephyr/http-server/src/main.c
+++ b/tutorials/zephyr/http-server/src/main.c
@@ -73,7 +73,8 @@ static void timer_fn(void *arg) {
 K_SEM_DEFINE(run, 0, 1);
 
 static void zeh(struct net_mgmt_event_callback *cb,
-#if ZEPHYR_VERSION_CODE < 0x40000
+// https://docs.zephyrproject.org/latest/releases/migration-guide-4.2.html#networking
+#if ZEPHYR_VERSION_CODE < 0x40200
                 uint32_t mgmt_event,
 #else
                 uint64_t mgmt_event,
diff --git a/tutorials/zephyr/mqtt-aws-client/src/main.c b/tutorials/zephyr/mqtt-aws-client/src/main.c
index 3c575130..430bc327 100644
--- a/tutorials/zephyr/mqtt-aws-client/src/main.c
+++ b/tutorials/zephyr/mqtt-aws-client/src/main.c
@@ -100,7 +100,8 @@ static void timer_fn(void *arg) {
 K_SEM_DEFINE(run, 0, 1);
 
 static void zeh(struct net_mgmt_event_callback *cb,
-#if ZEPHYR_VERSION_CODE < 0x40000
+// https://docs.zephyrproject.org/latest/releases/migration-guide-4.2.html#networking
+#if ZEPHYR_VERSION_CODE < 0x40200
                 uint32_t mgmt_event,
 #else
                 uint64_t mgmt_event,
diff --git a/tutorials/zephyr/websocket-server/src/main.c b/tutorials/zephyr/websocket-server/src/main.c
index be19713d..974187dc 100644
--- a/tutorials/zephyr/websocket-server/src/main.c
+++ b/tutorials/zephyr/websocket-server/src/main.c
@@ -69,7 +69,8 @@ static void timer_fn(void *arg) {
 K_SEM_DEFINE(run, 0, 1);
 
 static void zeh(struct net_mgmt_event_callback *cb,
-#if ZEPHYR_VERSION_CODE < 0x40000
+// https://docs.zephyrproject.org/latest/releases/migration-guide-4.2.html#networking
+#if ZEPHYR_VERSION_CODE < 0x40200
                 uint32_t mgmt_event,
 #else
                 uint64_t mgmt_event,