diff --git a/.github/actions/action-zephyr/Dockerfile b/.github/actions/action-zephyr/Dockerfile
index 3132cf7..ff3a6ac 100644
--- a/.github/actions/action-zephyr/Dockerfile
+++ b/.github/actions/action-zephyr/Dockerfile
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-FROM bcdevices/zephyr-west:zephyr-2.2.0-rc2-1
+FROM bcdevices/zephyr-west:zephyr-2.3.0-0
 
 LABEL "com.github.actions.name"="Zephyr build"
 LABEL "com.github.actions.description"="Build Zephyr project"
diff --git a/Dockerfile b/Dockerfile
index 3c8b7db..f1c8de4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-FROM bcdevices/zephyr-west:zephyr-2.2.0-rc2-1
+FROM bcdevices/zephyr-west:zephyr-2.3.0-0
 
 WORKDIR /usr/src/
 ## Copy everything (use .dockerignore to exclude)
diff --git a/Makefile b/Makefile
index a469cc7..914cad4 100644
--- a/Makefile
+++ b/Makefile
@@ -29,8 +29,8 @@ DOCKER_RUN_ARGS :=
 DOCKER_RUN_ARGS += --network=none
 
 BOARDS_COMMON :=
-BOARDS_COMMON += nrf52_pca10040
-BOARDS_COMMON += nrf9160_pca10090
+BOARDS_COMMON += nrf52dk_nrf52832
+BOARDS_COMMON += nrf9160dk_nrf9160
 BOARDS_COMMON += stm32f4_disco
 BOARDS_COMMON += nucleo_f207zg
 BOARDS_COMMON += nucleo_f401re
@@ -40,8 +40,8 @@ BOARDS_COMMON += disco_l475_iot1
 BLINKY_TARGETS := $(patsubst %,build.%/blinky/zephyr/zephyr.hex,$(BOARDS_COMMON))
 
 BOARDS_BUTTON :=
-BOARDS_BUTTON += nrf52_pca10040
-BOARDS_BUTTON += nrf9160_pca10090
+BOARDS_BUTTON += nrf52dk_nrf52832
+BOARDS_BUTTON += nrf9160dk_nrf9160
 BOARDS_BUTTON += stm32f4_disco
 BOARDS_BUTTON += nucleo_f207zg
 BOARDS_BUTTON += nucleo_f401re
@@ -53,28 +53,32 @@ BOARDS_CAN :=
 BOARDS_CAN += stm32f4_disco
 BOARDS_CAN += nucleo_l432kc
 
-CAN_TARGETS := $(patsubst %,build.%/CAN/zephyr/zephyr.hex,$(BOARDS_CAN))
+CAN_TARGETS := $(patsubst %,build.%/can/zephyr/zephyr.hex,$(BOARDS_CAN))
 
 BOARDS_GSM_MODEM :=
-BOARDS_GSM_MODEM += nrf52_pca10040
-BOARDS_GSM_MODEM += stm32f4_disco
-BOARDS_GSM_MODEM += nucleo_l432kc
+BOARDS_GSM_MODEM += nrf52dk_nrf52832
+#BOARDS_GSM_MODEM += stm32f4_disco # undefined references to `sys_rand32_get'
+#BOARDS_GSM_MODEM += nucleo_l432kc # undefined references to `sys_rand32_get'
 BOARDS_GSM_MODEM += disco_l475_iot1
 
 GSM_MODEM_TARGETS := $(patsubst %,build.%/gsm_modem/zephyr/zephyr.hex,$(BOARDS_GSM_MODEM))
 
 BOARDS_SERVO_MOTOR :=
-BOARDS_SERVO_MOTOR += nrf52_pca10040
-BOARDS_SERVO_MOTOR += nrf9160_pca10090
+#BOARDS_SERVO_MOTOR += nrf52dk_nrf52832 # Unsupported board
+#BOARDS_SERVO_MOTOR += nrf9160dk_nrf9160 # Unsupported board
 
 SERVO_MOTOR_TARGETS := $(patsubst %,build.%/servo_motor/zephyr/zephyr.hex,$(BOARDS_SERVO_MOTOR))
 
 SHELL_TARGETS := $(patsubst %,build.%/shell/zephyr/zephyr.hex,$(BOARDS_COMMON))
 
+ZEPHYR_SYSROOT := /usr/src/zephyrproject/zephyr
+#ZEPHYR_SYSROOT := /usr/src/zephyr-2.3.0/zephyr
+ZEPHYR_USRROOT := $(HOME)/src/zephyr-2.3.0/zephyr
+
 build.%/blinky/zephyr/zephyr.hex:
 	mkdir -p build.$*/blinky
-	if [ -d zephyrproject/zephyr ]; then source zephyrproject/zephyr/zephyr-env.sh ; \
-	elif [ -d /usr/src/zephyrproject/zephyr ]; then source /usr/src/zephyrproject/zephyr/zephyr-env.sh ; \
+	if [ -d $(ZEPHYR_USRROOT) ]; then source $(ZEPHYR_USRROOT)/zephyr-env.sh ; \
+	elif [ -d $(ZEPHYR_SYSROOT) ]; then source $(ZEPHYR_SYSROOT)/zephyr-env.sh ; \
 	else echo "No Zephyr"; fi && \
 	west build --build-dir build.$*/blinky \
 	  --board $* --pristine auto \
@@ -82,8 +86,8 @@ build.%/blinky/zephyr/zephyr.hex:
 
 build.%/button/zephyr/zephyr.hex:
 	mkdir -p build.$*/button
-	if [ -d zephyrproject/zephyr ]; then source zephyrproject/zephyr/zephyr-env.sh ; \
-	elif [ -d /usr/src/zephyrproject/zephyr ]; then source /usr/src/zephyrproject/zephyr/zephyr-env.sh ; \
+	if [ -d $(ZEPHYR_USRROOT) ]; then source $(ZEPHYR_USRROOT)/zephyr-env.sh ; \
+	elif [ -d $(ZEPHYR_SYSROOT) ]; then source $(ZEPHYR_SYSROOT)/zephyr-env.sh ; \
 	else echo "No Zephyr"; fi && \
 	west build --build-dir build.$*/button \
 	  --board $* --pristine auto \
@@ -91,8 +95,8 @@ build.%/button/zephyr/zephyr.hex:
 
 build.%/gsm_modem/zephyr/zephyr.hex:
 	mkdir -p build.$*/gsm_modem
-	if [ -d zephyrproject/zephyr ]; then source zephyrproject/zephyr/zephyr-env.sh ; \
-	elif [ -d /usr/src/zephyrproject/zephyr ]; then source /usr/src/zephyrproject/zephyr/zephyr-env.sh ; \
+	if [ -d $(ZEPHYR_USRROOT) ]; then source $(ZEPHYR_USRROOT)/zephyr-env.sh ; \
+	elif [ -d $(ZEPHYR_SYSROOT) ]; then source $(ZEPHYR_SYSROOT)/zephyr-env.sh ; \
 	else echo "No Zephyr"; fi && \
 	west build --build-dir build.$*/gsm_modem \
 	  --board $* --pristine auto \
@@ -100,8 +104,8 @@ build.%/gsm_modem/zephyr/zephyr.hex:
 
 build.%/servo_motor/zephyr/zephyr.hex:
 	mkdir -p build.$*/servo_motor
-	if [ -d zephyrproject/zephyr ]; then source zephyrproject/zephyr/zephyr-env.sh ; \
-	elif [ -d /usr/src/zephyrproject/zephyr ]; then source /usr/src/zephyrproject/zephyr/zephyr-env.sh ; \
+	if [ -d $(ZEPHYR_USRROOT) ]; then source $(ZEPHYR_USRROOT)/zephyr-env.sh ; \
+	elif [ -d $(ZEPHYR_SYSROOT) ]; then source $(ZEPHYR_SYSROOT)/zephyr-env.sh ; \
 	else echo "No Zephyr"; fi && \
 	west build --build-dir build.$*/servo_motor \
 	  --board $* --pristine auto \
@@ -109,21 +113,21 @@ build.%/servo_motor/zephyr/zephyr.hex:
 
 build.%/shell/zephyr/zephyr.hex:
 	mkdir -p build.$*/shell
-	if [ -d zephyrproject/zephyr ]; then source zephyrproject/zephyr/zephyr-env.sh ; \
-	elif [ -d /usr/src/zephyrproject/zephyr ]; then source /usr/src/zephyrproject/zephyr/zephyr-env.sh ; \
+	if [ -d $(ZEPHYR_USRROOT) ]; then source $(ZEPHYR_USRROOT)/zephyr-env.sh ; \
+	elif [ -d $(ZEPHYR_SYSROOT) ]; then source $(ZEPHYR_SYSROOT)/zephyr-env.sh ; \
 	else echo "No Zephyr"; fi && \
 	west build --build-dir build.$*/shell \
 	  --board $* --pristine auto \
 	  $$ZEPHYR_BASE/samples/subsys/shell/shell_module 
 
-build.%/CAN/zephyr/zephyr.hex:
-	mkdir -p build.$*/CAN
-	if [ -d zephyrproject/zephyr ]; then source zephyrproject/zephyr/zephyr-env.sh ; \
-	elif [ -d /usr/src/zephyrproject/zephyr ]; then source /usr/src/zephyrproject/zephyr/zephyr-env.sh ; \
+build.%/can/zephyr/zephyr.hex:
+	mkdir -p build.$*/can
+	if [ -d $(ZEPHYR_USRROOT) ]; then source $(ZEPHYR_USRROOT)/zephyr-env.sh ; \
+	elif [ -d $(ZEPHYR_SYSROOT) ]; then source $(ZEPHYR_SYSROOT)/zephyr-env.sh ; \
 	else echo "No Zephyr"; fi && \
-	west build --build-dir build.$*/CAN \
+	west build --build-dir build.$*/can \
 	  --board $* --pristine auto \
-	  $$ZEPHYR_BASE/samples/drivers/CAN
+	  $$ZEPHYR_BASE/samples/drivers/can
 
 .PHONY: build-blinky
 build-blinky: $(BLINKY_TARGETS)
@@ -144,19 +148,20 @@ build-shell: $(SHELL_TARGETS)
 build-CAN: $(CAN_TARGETS)
 
 .PHONY: build-zephyr-samples
-build-zephyr-samples: build-blinky build-button build-shell build-CAN build-gsm_modem build-servo_motor
+#build-zephyr-samples: build-blinky build-button build-shell build-CAN build-gsm_modem build-servo_motor
+build-zephyr-samples: build-blinky build-button build-shell build-CAN build-gsm_modem
 
 ZEPHYR_BOARD_ROOT := $(BASE_PATH)
 
 BOARDS_APP :=
 BOARDS_APP += ly10demo
-#BOARDS_APP := nrf52_pca10040
+#BOARDS_APP := nrf52dk_nrf52832
 
 APP_TARGETS := $(patsubst %,build.%/app/zephyr/zephyr.hex,$(BOARDS_APP))
 
 build.%/app/zephyr/zephyr.hex:
-	if [ -d zephyrproject/zephyr ]; then source zephyrproject/zephyr/zephyr-env.sh ; \
-	elif [ -d /usr/src/zephyrproject/zephyr ]; then source /usr/src/zephyrproject/zephyr/zephyr-env.sh ; \
+	if [ -d $(ZEPHYR_USRROOT) ]; then source $(ZEPHYR_USRROOT)/zephyr-env.sh ; \
+	elif [ -d $(ZEPHYR_SYSROOT) ]; then source $(ZEPHYR_SYSROOT)/zephyr-env.sh ; \
 	else echo "No Zephyr"; fi && \
           west build --build-dir build.$*/app --pristine auto \
 	  --board $* app -- -DBOARD_ROOT="$(ZEPHYR_BOARD_ROOT)"
@@ -179,7 +184,7 @@ prereq:
 	install -d zephyrproject
 	cd zephyrproject && west init --mr v2.2.0-rc2
 	cd zephyrproject && west update
-	pip3 install -r zephyrproject/zephyr/scripts/requirements.txt
+	pip3 install -r $(ZEPHYR_USRROOT)/scripts/requirements.txt
 
 .PHONY: dist-prep
 dist-prep:
@@ -198,15 +203,15 @@ dist: dist-clean dist-prep build
 	install -m 666 build.ly10demo/app/zephyr/zephyr.hex dist/ly10-zephyr-fw-$(VERSION_TAG).hex 
 	install -m 666 build.ly10demo/app/zephyr/zephyr.elf dist/ly10-zephyr-fw-$(VERSION_TAG).elf 
 	install -m 666 build.ly10demo/app/zephyr/zephyr.map dist/ly10-zephyr-fw-$(VERSION_TAG).map 
-	install -m 666 build.nrf52_pca10040/servo_motor/zephyr/zephyr.hex dist/zephyr-nrf52_pca100400-sample-servo_motor-$(VERSION_TAG).hex
-	install -m 666 build.nrf52_pca10040/blinky/zephyr/zephyr.hex dist/zephyr-nrf52_pca10040-sample-blinky-$(VERSION_TAG).hex
-	install -m 666 build.nrf52_pca10040/button/zephyr/zephyr.hex dist/zephyr-nrf52_pca10040-sample-button-$(VERSION_TAG).hex
-	install -m 666 build.nrf52_pca10040/gsm_modem/zephyr/zephyr.hex dist/zephyr-nrf52_pca10040-sample-gsm_modem-$(VERSION_TAG).hex
-	install -m 666 build.nrf52_pca10040/shell/zephyr/zephyr.hex dist/zephyr-nrf52_pca10040-sample-shell-$(VERSION_TAG).hex
-	install -m 666 build.nrf9160_pca10090/blinky/zephyr/zephyr.hex dist/zephyr-nrf9160_pca10090-sample-blinky-$(VERSION_TAG).hex
-	install -m 666 build.nrf9160_pca10090/button/zephyr/zephyr.hex dist/zephyr-nrf9160_pca10090-sample-button-$(VERSION_TAG).hex
-	install -m 666 build.nrf9160_pca10090/servo_motor/zephyr/zephyr.hex dist/zephyr-nrf9160_pca10090-sample-servo_motor-$(VERSION_TAG).hex
-	install -m 666 build.nrf9160_pca10090/shell/zephyr/zephyr.hex dist/zephyr-nrf9160_pca10090-sample-shell-$(VERSION_TAG).hex
+	#install -m 666 build.nrf52dk_nrf52832/servo_motor/zephyr/zephyr.hex dist/zephyr-nrf52dk_nrf528320-sample-servo_motor-$(VERSION_TAG).hex
+	install -m 666 build.nrf52dk_nrf52832/blinky/zephyr/zephyr.hex dist/zephyr-nrf52dk_nrf52832-sample-blinky-$(VERSION_TAG).hex
+	install -m 666 build.nrf52dk_nrf52832/button/zephyr/zephyr.hex dist/zephyr-nrf52dk_nrf52832-sample-button-$(VERSION_TAG).hex
+	install -m 666 build.nrf52dk_nrf52832/gsm_modem/zephyr/zephyr.hex dist/zephyr-nrf52dk_nrf52832-sample-gsm_modem-$(VERSION_TAG).hex
+	install -m 666 build.nrf52dk_nrf52832/shell/zephyr/zephyr.hex dist/zephyr-nrf52dk_nrf52832-sample-shell-$(VERSION_TAG).hex
+	install -m 666 build.nrf9160dk_nrf9160/blinky/zephyr/zephyr.hex dist/zephyr-nrf9160dk_nrf9160-sample-blinky-$(VERSION_TAG).hex
+	install -m 666 build.nrf9160dk_nrf9160/button/zephyr/zephyr.hex dist/zephyr-nrf9160dk_nrf9160-sample-button-$(VERSION_TAG).hex
+	#install -m 666 build.nrf9160dk_nrf9160/servo_motor/zephyr/zephyr.hex dist/zephyr-nrf9160dk_nrf9160-sample-servo_motor-$(VERSION_TAG).hex
+	install -m 666 build.nrf9160dk_nrf9160/shell/zephyr/zephyr.hex dist/zephyr-nrf9160dk_nrf9160-sample-shell-$(VERSION_TAG).hex
 	install -m 666 build.nucleo_f207zg/blinky/zephyr/zephyr.hex dist/zephyr-nucleo_f207zg-sample-blinky-$(VERSION_TAG).hex
 	install -m 666 build.nucleo_f207zg/button/zephyr/zephyr.hex dist/zephyr-nucleo_f207zg-sample-button-$(VERSION_TAG).hex
 	install -m 666 build.nucleo_f207zg/shell/zephyr/zephyr.hex dist/zephyr-nucleo_f207zg-sample-shell-$(VERSION_TAG).hex
@@ -214,13 +219,13 @@ dist: dist-clean dist-prep build
 	install -m 666 build.nucleo_f401re/button/zephyr/zephyr.hex dist/zephyr-nucleo_f401re-sample-button-$(VERSION_TAG).hex
 	install -m 666 build.nucleo_f401re/shell/zephyr/zephyr.hex dist/zephyr-nucleo_f401re-sample-shell-$(VERSION_TAG).hex
 	install -m 666 build.nucleo_l432kc/blinky/zephyr/zephyr.hex dist/zephyr-nucleo_l432kc-sample-blinky-$(VERSION_TAG).hex
-	install -m 666 build.nucleo_l432kc/CAN/zephyr/zephyr.hex dist/zephyr-nucleo_l432kc-sample-CAN-$(VERSION_TAG).hex
-	install -m 666 build.nucleo_l432kc/gsm_modem/zephyr/zephyr.hex dist/zephyr-nucleo_l432kc-sample-gsm_modem-$(VERSION_TAG).hex
+	install -m 666 build.nucleo_l432kc/can/zephyr/zephyr.hex dist/zephyr-nucleo_l432kc-sample-can-$(VERSION_TAG).hex
+	#install -m 666 build.nucleo_l432kc/gsm_modem/zephyr/zephyr.hex dist/zephyr-nucleo_l432kc-sample-gsm_modem-$(VERSION_TAG).hex
 	install -m 666 build.nucleo_l432kc/shell/zephyr/zephyr.hex dist/zephyr-nucleo_l432kc-sample-shell-$(VERSION_TAG).hex
 	install -m 666 build.stm32f4_disco/blinky/zephyr/zephyr.hex dist/zephyr-stm32f4_disco-sample-blinky-$(VERSION_TAG).hex
 	install -m 666 build.stm32f4_disco/button/zephyr/zephyr.hex dist/zephyr-stm32f4_disco-sample-button-$(VERSION_TAG).hex
-	install -m 666 build.stm32f4_disco/CAN/zephyr/zephyr.hex dist/zephyr-stm32f4_disco-sample-CAN-$(VERSION_TAG).hex
-	install -m 666 build.stm32f4_disco/gsm_modem/zephyr/zephyr.hex dist/zephyr-stm32f4_disco-sample-gsm_modem-$(VERSION_TAG).hex
+	install -m 666 build.stm32f4_disco/can/zephyr/zephyr.hex dist/zephyr-stm32f4_disco-sample-can-$(VERSION_TAG).hex
+	#install -m 666 build.stm32f4_disco/gsm_modem/zephyr/zephyr.hex dist/zephyr-stm32f4_disco-sample-gsm_modem-$(VERSION_TAG).hex
 	install -m 666 build.stm32f4_disco/shell/zephyr/zephyr.hex dist/zephyr-stm32f4_disco-sample-shell-$(VERSION_TAG).hex
 	sed 's/{{VERSION}}/$(VERSION_TAG)/g' test-suites/suite-LY10-zephyr.yaml.template > dist/suite-LY10-zephyr-$(VERSION_TAG).yaml
 
diff --git a/app/src/app_buzzer.c b/app/src/app_buzzer.c
index c666d56..f1f6885 100644
--- a/app/src/app_buzzer.c
+++ b/app/src/app_buzzer.c
@@ -16,19 +16,15 @@
 #define PAUSE_DURATION  K_MSEC(1)
 #define US_TO_HZ(_us)  (USEC_PER_SEC / (_us))
 
-#if defined(CONFIG_SOC_FAMILY_NRF)
-#if defined(CONFIG_PWM_NRF5_SW)
-#define PWM_DRIVER CONFIG_PWM_NRF5_SW_0_DEV_NAME
-#else
-#define PWM_DRIVER DT_NORDIC_NRF_PWM_PWM_0_LABEL
-#endif				/* CONFIG_PWM_NRF5_SW */
+#define PWM_NODE DT_ALIAS(pwm_buzzer)
+
+#if DT_NODE_HAS_STATUS(PWM_NODE, okay)
+#define PWM_LABEL DT_LABEL(PWM_NODE)
 #define PWM_CHANNEL BUZZER_PIN
-#elif defined(PWM_BUZZER0_PWM_CONTROLLER) && defined(PWM_BUZZER0_PWM_CHANNEL)
-/* get the defines from dt (based on alias 'pwm-buzzer0') */
-#define PWM_DRIVER      PWM_BUZZER0_PWM_CONTROLLER
-#define PWM_CHANNEL     PWM_BUZZER0_PWM_CHANNEL
 #else
-#error "Choose supported PWM driver"
+#error "Unsupported board: pwm-buzzer devicetree alias is not defined or enabled"
+#define PWM_LABEL 0
+#define PWM_CHANNEL 0
 #endif
 
 static u32_t period = PERIOD_INIT;
@@ -49,7 +45,7 @@ int app_buzzer_setup(void)
 {
     struct device *pwm;
 
-    pwm = device_get_binding(PWM_DRIVER);
+    pwm = device_get_binding(PWM_LABEL);
     if (NULL == pwm) {
 	return -1;
     }
diff --git a/app/src/app_ledstrip.c b/app/src/app_ledstrip.c
index 380bafe..bf6164c 100644
--- a/app/src/app_ledstrip.c
+++ b/app/src/app_ledstrip.c
@@ -69,7 +69,8 @@ int app_ledstrip_setup(void)
     }
 
     /* APA102 Strip */
-    strip = device_get_binding(DT_INST_0_APA_APA102_LABEL);
+    strip = device_get_binding(DT_LABEL(DT_INST(0, apa_apa102)));
+
     if (!strip) {
 	printk("Cannot find %s!\n", GPIO_OUT_DRV_NAME);
 	return -1;
diff --git a/boards/arm/ly10demo/Kconfig b/boards/arm/ly10demo/Kconfig
index f765aa1..e390e19 100644
--- a/boards/arm/ly10demo/Kconfig
+++ b/boards/arm/ly10demo/Kconfig
@@ -4,11 +4,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_LY10DEMO
 
 config BOARD_ENABLE_DCDC
 	bool "Enable DCDC mode"
 	select SOC_DCDC_NRF52X
 	default y
-
-endif # BOARD_LY10DEMO
+	depends on BOARD_LY10DEMO
diff --git a/boards/arm/ly10demo/Kconfig.defconfig b/boards/arm/ly10demo/Kconfig.defconfig
index eaea0f5..9a687cf 100644
--- a/boards/arm/ly10demo/Kconfig.defconfig
+++ b/boards/arm/ly10demo/Kconfig.defconfig
@@ -9,34 +9,6 @@ if BOARD_LY10DEMO
 config BOARD
 	default "ly10demo"
 
-if ADC
-
-config ADC_0
-	default y
-
-endif # ADC
-
-if I2C
-
-config I2C_0
-	default y
-
-endif # I2C
-
-if PWM
-
-config PWM_0
-	default y
-
-endif # PWM
-
-if SPI
-
-config SPI_1
-	default y
-
-endif # SPI
-
 config BT_CTLR
 	default BT
 
diff --git a/boards/arm/ly10demo/board.cmake b/boards/arm/ly10demo/board.cmake
index ddd57ab..4f6fc1f 100644
--- a/boards/arm/ly10demo/board.cmake
+++ b/boards/arm/ly10demo/board.cmake
@@ -1,6 +1,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
+set(OPENOCD_NRF5_SUBFAMILY "nrf52")
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nrf52" "--speed=4000")
+board_runner_args(pyocd "--target=nrf52" "--frequency=4000000")
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/arm/ly10demo/ly10demo.dts b/boards/arm/ly10demo/ly10demo.dts
index ae76b5f..3a54e1e 100644
--- a/boards/arm/ly10demo/ly10demo.dts
+++ b/boards/arm/ly10demo/ly10demo.dts
@@ -11,14 +11,14 @@
 
 / {
 	model = "BCD LY10DEMO Demo Board";
-	compatible = "nordic,pca10040-dk", "nordic,nrf52832-qfaa",
-		     "nordic,nrf52832";
+	compatible = "nordic,nrf52-dk-nrf52832";
 
 	chosen {
 		zephyr,console = &uart0;
 		zephyr,shell-uart = &uart0;
 		zephyr,uart-mcumgr = &uart0;
 		zephyr,bt-mon-uart = &uart0;
+		zephyr,bt-c2h-uart = &uart0;
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
@@ -27,11 +27,11 @@
 	buttons {
 		compatible = "gpio-keys";
 		button0: button_0 {
-			gpios = <&gpio0 26 GPIO_PUD_PULL_UP>;
+			gpios = <&gpio0 26 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
 			label = "Push button switch 0";
 		};
 		button1: button_1 {
-			gpios = <&gpio0 21 GPIO_PUD_PULL_UP>;
+			gpios = <&gpio0 21 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
 			label = "Push button switch 1";
 		};
 	};
@@ -40,6 +40,7 @@
 	aliases {
 		sw0 = &button0;
 		sw1 = &button1;
+		pwm-buzzer = &pwm0;
 	};
 };
 
diff --git a/boards/arm/ly10demo/ly10demo_defconfig b/boards/arm/ly10demo/ly10demo_defconfig
index b1d121f..17c670e 100644
--- a/boards/arm/ly10demo/ly10demo_defconfig
+++ b/boards/arm/ly10demo/ly10demo_defconfig
@@ -15,7 +15,6 @@ CONFIG_GPIO=y
 
 # enable uart driver
 CONFIG_SERIAL=y
-CONFIG_UART_0_NRF_UART=y
 
 # enable console
 CONFIG_CONSOLE=y