diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ea4b90d..9aed6d4 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
-	"name": "nrf-connect:v2.1",
-	"image": "nordicplayground/nrfconnect-sdk:v2.1-branch",
+	"name": "nrf-connect:v2.2",
+	"image": "nordicplayground/nrfconnect-sdk:v2.2-branch",
 	"features": {
 	},
 	"customizations": {
diff --git a/.github/actions/build/Dockerfile b/.github/actions/build/Dockerfile
index 8f3f60f..0f54cda 100644
--- a/.github/actions/build/Dockerfile
+++ b/.github/actions/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM nordicplayground/nrfconnect-sdk:v2.1-branch
+FROM nordicplayground/nrfconnect-sdk:v2.2-branch
 
 COPY build.sh /build.sh
 
diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts
index b1b2313..7a68d18 100644
--- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts
+++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts
@@ -10,6 +10,7 @@
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
+		zephyr,ieee802154 = &ieee802154;
 	};
 
 	zephyr,user {
@@ -61,6 +62,10 @@
 	status = "okay";
 };
 
+&ieee802154 {
+	status = "okay";
+};
+
 &uart0 {
 	compatible = "nordic,nrf-uart";
 	status = "disabled";
diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts
index 9a6ac04..578a023 100644
--- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts
+++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts
@@ -10,6 +10,7 @@
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
+		zephyr,ieee802154 = &ieee802154;
 	};
 
 	zephyr,user {
@@ -61,6 +62,10 @@
 	status = "okay";
 };
 
+&ieee802154 {
+	status = "okay";
+};
+
 &uart0 {
 	compatible = "nordic,nrf-uart";
 	status = "disabled";
diff --git a/code/nrf-connect/samples/zigbee/prj.conf b/code/nrf-connect/samples/zigbee/prj.conf
index 296ca0d..5583b53 100644
--- a/code/nrf-connect/samples/zigbee/prj.conf
+++ b/code/nrf-connect/samples/zigbee/prj.conf
@@ -29,6 +29,7 @@ CONFIG_CRYPTO_NRF_ECB=y
 CONFIG_CRYPTO_INIT_PRIORITY=80
 
 # Networking
+CONFIG_NET_IPV6=n
 CONFIG_NET_IPV6_MLD=n
 CONFIG_NET_IPV6_NBR_CACHE=n
 CONFIG_NET_IPV6_RA_RDNSS=n