diff --git a/samples/radio_test_bm/prj.conf b/samples/radio_test_bm/prj.conf
index 8b3a298..2af8ce9 100644
--- a/samples/radio_test_bm/prj.conf
+++ b/samples/radio_test_bm/prj.conf
@@ -18,7 +18,6 @@ CONFIG_SHELL_BACKEND_SERIAL=y
 # Debugs
 CONFIG_THREAD_MONITOR=y
 CONFIG_LOG=y
-CONFIG_LOG_BUFFER_SIZE=4096
 # For automation scripts only
 CONFIG_SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE=1024
 CONFIG_LOG=y
diff --git a/samples/radio_test_bm/src/nrf_wifi_radio_test_main.c b/samples/radio_test_bm/src/nrf_wifi_radio_test_main.c
index 038f7c6..5b7a18f 100644
--- a/samples/radio_test_bm/src/nrf_wifi_radio_test_main.c
+++ b/samples/radio_test_bm/src/nrf_wifi_radio_test_main.c
@@ -31,17 +31,20 @@ int main(void)
 #endif
 
 	// Initialize the WiFi module
-	CHECK_RET(nrf70_bm_init());
+	CHECK_RET(nrf70_bm_init(NULL, NULL));
 
 	printf("Initialized WiFi module, ready for radio test\n");
 
 	ret = nrf_wifi_radio_test_shell_init();
-	if (!ret) {
+	if (ret) {
 		printf("Failed to initialize radio test: %d\n", ret);
 		goto cleanup;
 	}
 
 cleanup:
-	printf("Exiting WiFi radio test sample application with error: %d\n", ret);
+	if (ret) {
+		nrf70_bm_deinit();
+		printf("Exiting WiFi radio test sample application with error: %d\n", ret);
+	}
 	return ret;
 }
diff --git a/samples/scan_bm/Kconfig b/samples/scan_bm/Kconfig
index 3ef1bd1..e4c124d 100644
--- a/samples/scan_bm/Kconfig
+++ b/samples/scan_bm/Kconfig
@@ -125,4 +125,10 @@ config WIFI_SCAN_PROFILE_2_4GHz_NON_OVERLAP_AND_5GHz_NON_DFS_CHAN
 
 endchoice
 
+config WIFI_SCAN_REG_DOMAIN
+	string "Regulatory domain"
+	default "00"
+	help
+	  Specifies the regulatory domain to be used for the scan.
+
 endmenu
diff --git a/samples/scan_bm/src/main.c b/samples/scan_bm/src/main.c
index 78ec145..c1d3bc9 100644
--- a/samples/scan_bm/src/main.c
+++ b/samples/scan_bm/src/main.c
@@ -101,7 +101,7 @@ int main(void)
 
 	printf("WiFi scan sample application using nRF70 Bare Metal library\n");
 
-	memcpy(reg_info.country_code, "IN", 2);
+	memcpy(reg_info.country_code, CONFIG_NRF70_REG_DOMAIN, 2);
 	reg_info.force = true;
 
 	// Initialize the WiFi module