diff --git a/RIOT b/RIOT
index 398a066..81a01df 160000
--- a/RIOT
+++ b/RIOT
@@ -1 +1 @@
-Subproject commit 398a06655298a8c705f2bc35aab6703b2c50debd
+Subproject commit 81a01df5d94729b8d8a2be7ce8e68f9fc7c7b95f
diff --git a/coap-chat/Makefile b/coap-chat/Makefile
index 5fb8fb1..6ef5dd1 100644
--- a/coap-chat/Makefile
+++ b/coap-chat/Makefile
@@ -7,7 +7,7 @@ BOARD ?= native
 # This has to be the absolute path to the RIOT base directory:
 RIOTBASE ?= $(CURDIR)/../RIOT
 
-USEMODULE += gnrc_netdev_default
+USEMODULE += netdev_default
 USEMODULE += auto_init_gnrc_netif
 # Specify the mandatory networking modules
 USEMODULE += gnrc_ipv6_default
diff --git a/coap-chat/coap.c b/coap-chat/coap.c
index 20de029..a404eb8 100644
--- a/coap-chat/coap.c
+++ b/coap-chat/coap.c
@@ -30,7 +30,7 @@
 
 #define COAP_CHAT_PATH      "/chat"
 
-static ssize_t _chat_handler(coap_pkt_t *pdu, uint8_t *buf, size_t len, void *ctx);
+static ssize_t _chat_handler(coap_pkt_t *pdu, uint8_t *buf, size_t len, coap_request_ctx_t *ctx);
 
 /* CoAP resources */
 static const coap_resource_t _resources[] = {
@@ -43,7 +43,7 @@ static gcoap_listener_t _listener = {
     .next = NULL,
 };
 
-static ssize_t _chat_handler(coap_pkt_t *pdu, uint8_t *buf, size_t len, void *ctx)
+static ssize_t _chat_handler(coap_pkt_t *pdu, uint8_t *buf, size_t len, coap_request_ctx_t *ctx)
 {
     (void)ctx;
 
diff --git a/sniffer/Makefile b/sniffer/Makefile
index 037df6f..3368b06 100644
--- a/sniffer/Makefile
+++ b/sniffer/Makefile
@@ -10,12 +10,12 @@ RIOTBASE ?= $(CURDIR)/../RIOT
 # Define modules that are used
 USEMODULE += fmt
 USEMODULE += gnrc
-USEMODULE += gnrc_netdev_default
+USEMODULE += netdev_default
 USEMODULE += auto_init_gnrc_netif
 USEMODULE += shell
 USEMODULE += shell_commands
 USEMODULE += ps
-USEMODULE += xtimer
+USEMODULE += ztimer64_usec
 
 # Change this to 0 show compiler invocation lines by default:
 QUIET ?= 1
diff --git a/sniffer/main.c b/sniffer/main.c
index 0846c98..48314c4 100644
--- a/sniffer/main.c
+++ b/sniffer/main.c
@@ -24,10 +24,9 @@
 
 #include "fmt.h"
 #include "thread.h"
-#include "xtimer.h"
 #include "shell.h"
-#include "shell_commands.h"
 #include "net/gnrc.h"
+#include "ztimer64.h"
 
 /**
  * @brief   Buffer size used by the shell
@@ -63,7 +62,7 @@ void dump_pkt(gnrc_pktsnip_t *pkt)
             pkt = gnrc_pktbuf_remove_snip(pkt, pkt->next);
         }
     }
-    uint64_t now_us = xtimer_usec_from_ticks64(xtimer_now64());
+    uint64_t now_us = ztimer64_now(ZTIMER64_USEC);
 
     print_str("rftest-rx --- len ");
     print_u32_hex((uint32_t)gnrc_pkt_len(pkt));
diff --git a/spectrum-scanner/Makefile b/spectrum-scanner/Makefile
index df7e61c..ce59849 100644
--- a/spectrum-scanner/Makefile
+++ b/spectrum-scanner/Makefile
@@ -9,9 +9,10 @@ RIOTBASE ?= $(CURDIR)/../RIOT
 
 # Define modules that are used
 USEMODULE += gnrc
-USEMODULE += gnrc_netdev_default
+USEMODULE += netdev_default
 USEMODULE += auto_init_gnrc_netif
 USEMODULE += xtimer
+USEMODULE += ztimer64_xtimer_compat
 USEMODULE += fmt
 
 # Change this to 0 show compiler invocation lines by default: