diff --git a/samples/bluetooth/direct_test_mode/src/dtm_hw.c b/samples/bluetooth/direct_test_mode/src/dtm_hw.c
index 5f181182e455..85dec3b5c324 100644
--- a/samples/bluetooth/direct_test_mode/src/dtm_hw.c
+++ b/samples/bluetooth/direct_test_mode/src/dtm_hw.c
@@ -112,8 +112,13 @@ const int8_t nrf_power_value[] = {
 /* Run a macro 'fn' on each available DFE GPIO index, from 0 to
  * MAX_DFE_GPIO-1, with the given parenthesized separator.
  */
-#define FOR_EACH_DFE_GPIO(fn, sep) \
-	FOR_EACH(fn, sep, 0, 1, 2, 3, 4, 5, 6, 7)
+#if DTM_HW_MAX_DFE_GPIO == 8
+#define FOR_EACH_DFE_GPIO(fn, sep) FOR_EACH(fn, sep, 0, 1, 2, 3, 4, 5, 6, 7)
+#elif DTM_HW_MAX_DFE_GPIO == 7
+#define FOR_EACH_DFE_GPIO(fn, sep) FOR_EACH(fn, sep, 0, 1, 2, 3, 4, 5, 6)
+#else
+#error "Unsupported DFE GPIO count"
+#endif
 
 /* The number of dfegpio[n]-gpios properties which are set. */
 #define DFE_GPIO_NUM (FOR_EACH_DFE_GPIO(HAS_DFE_GPIO, (+)))
diff --git a/samples/bluetooth/direct_test_mode/src/dtm_hw.h b/samples/bluetooth/direct_test_mode/src/dtm_hw.h
index 0629395bb918..f699c51af9da 100644
--- a/samples/bluetooth/direct_test_mode/src/dtm_hw.h
+++ b/samples/bluetooth/direct_test_mode/src/dtm_hw.h
@@ -17,7 +17,11 @@ extern "C" {
 #endif
 
 /* Number of PSEL_DFEGPIO[n] registers in the radio peripheral. */
+#if defined(RADIO_PSEL_DFEGPIO_MaxCount)
+#define DTM_HW_MAX_DFE_GPIO RADIO_PSEL_DFEGPIO_MaxCount
+#else
 #define DTM_HW_MAX_DFE_GPIO 8
+#endif
 
 /* Indicates that GPIO pin is not connected to the radio */
 #define DTM_HW_DFE_PSEL_NOT_SET 0xFF
diff --git a/tests/zephyr/drivers/adc/adc_accuracy_test/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay b/tests/zephyr/drivers/adc/adc_accuracy_test/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay
index 0777fce02ae4..fa49fba0ba4c 100644
--- a/tests/zephyr/drivers/adc/adc_accuracy_test/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay
+++ b/tests/zephyr/drivers/adc/adc_accuracy_test/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay
@@ -19,7 +19,7 @@
 
 	channel@0 {
 		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1_2";
+		zephyr,gain = "ADC_GAIN_1";
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,input-positive = <NRF_SAADC_AIN2>;
diff --git a/tests/zephyr/drivers/adc/adc_api/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay b/tests/zephyr/drivers/adc/adc_api/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay
index 7ae100ff2436..06e6af925b43 100644
--- a/tests/zephyr/drivers/adc/adc_api/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay
+++ b/tests/zephyr/drivers/adc/adc_api/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay
@@ -26,7 +26,7 @@
 
 	channel@1 {
 		reg = <1>;
-		zephyr,gain = "ADC_GAIN_1_4";
+		zephyr,gain = "ADC_GAIN_1";
 		zephyr,reference = "ADC_REF_EXTERNAL0";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,input-positive = <NRF_SAADC_AIN4>;
@@ -35,7 +35,7 @@
 
 	channel@2 {
 		reg = <2>;
-		zephyr,gain = "ADC_GAIN_2_3";
+		zephyr,gain = "ADC_GAIN_1";
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
 		zephyr,input-positive = <NRF_SAADC_AIN2>;
diff --git a/west.yml b/west.yml
index 4b204efe9f12..f644bc3f1778 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: 247ef302c2269d63b8957e5a346ab42a5f0b3bc8
+      revision: 63b28baebfc909e707d34c9d41f5fd4ef7aa47c7
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above