diff --git a/samples/cellular/modem_shell/src/drivers/nrf91_non_offloaded_dev.c b/samples/cellular/modem_shell/src/drivers/nrf91_non_offloaded_dev.c
index 25a88cdc144a..0b1aa2034de6 100644
--- a/samples/cellular/modem_shell/src/drivers/nrf91_non_offloaded_dev.c
+++ b/samples/cellular/modem_shell/src/drivers/nrf91_non_offloaded_dev.c
@@ -320,7 +320,8 @@ static void nrf91_non_offload_mdm_socket_worker(struct k_work *unused)
 				};
 
 				dnsctx = dns_resolve_get_default();
-				ret = dns_resolve_reconfigure(dnsctx, NULL, dns_servers);
+				ret = dns_resolve_reconfigure(dnsctx, NULL, dns_servers,
+							      DNS_SOURCE_MANUAL);
 				if (ret < 0) {
 					mosh_error("Could not set DNS servers");
 				}
diff --git a/west.yml b/west.yml
index 1007a6ef67d3..2898dcd15f55 100644
--- a/west.yml
+++ b/west.yml
@@ -65,7 +65,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 1e6c54956840f1d03cb4455b5a93d2ef72864b7d
+      revision: 6b0b2830c2e7b71c29579f744ca2268227e50499
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above