diff --git a/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig b/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig
index f72bf64a50c..fb2e2012999 100644
--- a/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig
+++ b/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig
@@ -4,9 +4,26 @@ if BOARD_QUARK_SE_C1000_DEVBOARD
 config BOARD
 	default "quark_se_c1000_devboard"
 
+if BLUETOOTH_H4
+
+config BLUETOOTH_UART_ON_DEV_NAME
+	default UART_QMSI_0_NAME
+
+config UART_QMSI_0_BAUDRATE
+	default 1000000
+
 config UART_QMSI_0_HW_FC
 	def_bool y
 
+endif
+
+if UART_PIPE
+
+config UART_PIPE_ON_DEV_NAME
+	default UART_QMSI_1_NAME
+
+endif
+
 if SYS_POWER_MANAGEMENT
 
 config BUSY_WAIT_USES_ALTERNATE_CLOCK
@@ -14,6 +31,9 @@ config BUSY_WAIT_USES_ALTERNATE_CLOCK
 
 endif
 
+config BLUETOOTH_MONITOR_ON_DEV_NAME
+	default UART_QMSI_1_NAME if BLUETOOTH_DEBUG_MONITOR
+
 if IEEE802154_CC2520
 
 config SPI
diff --git a/boards/x86/quark_se_c1000_devboard/Makefile.board b/boards/x86/quark_se_c1000_devboard/Makefile.board
index a59b5519ae0..e79be2739f0 100644
--- a/boards/x86/quark_se_c1000_devboard/Makefile.board
+++ b/boards/x86/quark_se_c1000_devboard/Makefile.board
@@ -1,8 +1,8 @@
 FLASH_SCRIPT = openocd.sh
 DEBUG_SCRIPT = openocd.sh
 OPENOCD_PRE_CMD = "targets 1"
-OPENOCD_LOAD_CMD = "load_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
-OPENOCD_VERIFY_CMD = "verify_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
+OPENOCD_LOAD_CMD = "load_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_PHYS_LOAD_ADDR}"
+OPENOCD_VERIFY_CMD = "verify_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_PHYS_LOAD_ADDR}"
 
 export FLASH_SCRIPT OPENOCD_VERIFY_CMD OPENOCD_LOAD_CMD OPENOCD_PRE_CMD
 
diff --git a/boards/x86/quark_se_c1000_devboard/quark_se_c1000_devboard_defconfig b/boards/x86/quark_se_c1000_devboard/quark_se_c1000_devboard_defconfig
index 1eb16a344d7..1f5ec94cd7a 100644
--- a/boards/x86/quark_se_c1000_devboard/quark_se_c1000_devboard_defconfig
+++ b/boards/x86/quark_se_c1000_devboard/quark_se_c1000_devboard_defconfig
@@ -11,4 +11,3 @@ CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_PRINTK=y
 CONFIG_PINMUX=y
-CONFIG_HAS_DTS=y
diff --git a/dts/x86/Makefile b/dts/x86/Makefile
index e77367e1b97..47b1c1bee30 100644
--- a/dts/x86/Makefile
+++ b/dts/x86/Makefile
@@ -1,7 +1,6 @@
 ifeq ($(CONFIG_HAS_DTS),y)
-dtb-$(CONFIG_SOC_QUARK_SE_C1000)		=	arduino_101.dts_compiled
-dtb-$(CONFIG_BOARD_QUARK_D2000_CRB)		=	quark_d2000_crb.dts_compiled
-dtb-$(CONFIG_BOARD_TINYTILE)			=	tinytile.dts_compiled
-dtb-$(CONFIG_BOARD_QUARK_SE_C1000_DEVBOARD)	=	quark_se_c1000_devboard.dts_compiled
+dtb-$(CONFIG_SOC_QUARK_SE_C1000)	=	arduino_101.dts_compiled
+dtb-$(CONFIG_BOARD_QUARK_D2000_CRB)	=	quark_d2000_crb.dts_compiled
+dtb-$(CONFIG_BOARD_TINYTILE)		=	tinytile.dts_compiled
 always	:= $(dtb-y)
 endif
diff --git a/dts/x86/quark_se_c1000_devboard.dts b/dts/x86/quark_se_c1000_devboard.dts
deleted file mode 100644
index 050151dc549..00000000000
--- a/dts/x86/quark_se_c1000_devboard.dts
+++ /dev/null
@@ -1,32 +0,0 @@
-/dts-v1/;
-
-#include "intel_curie.dtsi"
-
-/ {
-	model = "quark_se_c1000_devboard";
-	compatible = "intel,quark_se_c1000_devboard", "intel,quark_se_c1000";
-
-	aliases {
-		uart_0 = &uart0;
-		uart_1 = &uart1;
-	};
-
-	chosen {
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,console = &uart1;
-		zephyr,bt-uart = &uart0;
-		zephyr,uart-pipe = &uart1;
-		zephyr,bt-mon-uart = &uart1;
-	};
-};
-
-&uart0 {
-	status = "ok";
-	current-speed = <1000000>;
-};
-
-&uart1 {
-	status = "ok";
-	current-speed = <115200>;
-};
diff --git a/dts/x86/quark_se_c1000_devboard.fixup b/dts/x86/quark_se_c1000_devboard.fixup
deleted file mode 100644
index d446604356a..00000000000
--- a/dts/x86/quark_se_c1000_devboard.fixup
+++ /dev/null
@@ -1,9 +0,0 @@
-#define CONFIG_UART_QMSI_0_BAUDRATE	INTEL_QMSI_UART_B0002000_CURRENT_SPEED
-#define CONFIG_UART_QMSI_0_NAME		INTEL_QMSI_UART_B0002000_LABEL
-
-#define CONFIG_UART_QMSI_1_BAUDRATE	INTEL_QMSI_UART_B0002400_CURRENT_SPEED
-#define CONFIG_UART_QMSI_1_NAME		INTEL_QMSI_UART_B0002400_LABEL
-
-#define CONFIG_PHYS_RAM_ADDR		CONFIG_SRAM_BASE_ADDRESS
-
-#define CONFIG_PHYS_LOAD_ADDR		CONFIG_FLASH_BASE_ADDRESS