diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
index 9696a2445..e78ba5f7f 100644
--- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
@@ -37,6 +37,9 @@ KERNEL_DEVICETREE ?= " \
 
 SERIAL_CONSOLES ?= "115200;ttymxc3"
 
+# Bluetooth interface
+BT_DEVICE_NAME ?= "cc6qp"
+
 # Bluetooth tty
 BT_TTY ?= "ttymxc1"
 
diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf
index afb4d2515..bd8423913 100644
--- a/meta-digi-arm/conf/machine/ccimx6sbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf
@@ -38,6 +38,9 @@ KERNEL_DEVICETREE ?= " \
 
 SERIAL_CONSOLES ?= "115200;ttymxc3"
 
+# Bluetooth interface
+BT_DEVICE_NAME ?= "cc6"
+
 # Bluetooth tty
 BT_TTY ?= "ttymxc1"
 
diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
index c848046f5..78a6cb40d 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
@@ -12,6 +12,9 @@ include conf/machine/include/tune-cortexa7.inc
 UBOOT_PREFIX = "u-boot"
 UBOOT_SUFFIX = "imx"
 
+# Bluetooth interface
+BT_DEVICE_NAME ?= "cc6ul"
+
 # Wireless external module
 WIRELESS_MODULE ?= ""
 WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
diff --git a/meta-digi-arm/conf/machine/include/ccimx8mn.inc b/meta-digi-arm/conf/machine/include/ccimx8mn.inc
index 617add729..1e768b50a 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8mn.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8mn.inc
@@ -22,6 +22,9 @@ SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}"
 # Linux kernel configuration
 KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8_defconfig"
 
+# Bluetooth interface
+BT_DEVICE_NAME ?= "cc8mn"
+
 # Wireless external module
 WIRELESS_MODULE ?= ""
 WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc
index ea765ec12..323f3cfe8 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8x.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc
@@ -29,6 +29,9 @@ RAM_CONFIGS = "1.2GHz_512MB_16bit 1.2GHz_1GB_16bit 1.2GHz_1GB_32bit 1.2GHz_2GB_3
 # Linux kernel configuration
 KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8x_defconfig"
 
+# Bluetooth interface
+BT_DEVICE_NAME ?= "cc8x"
+
 # Wireless external module
 WIRELESS_MODULE ?= ""
 WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8x/main.conf b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8x/main.conf
deleted file mode 100644
index 1fae07f0e..000000000
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8x/main.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[General]
-
-# Default adapter name
-# Defaults to 'BlueZ X.YZ'
-Name = cc8x
-
-[Policy]
-
-# AutoEnable defines option to enable all controllers when they are found.
-# This includes adapters present on start as well as adapters that are plugged
-# in later on. Defaults to 'false'.
-AutoEnable=true
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5/ccimx6qpsbc/main.conf b/meta-digi-dey/recipes-connectivity/bluez/bluez5/ccimx6qpsbc/main.conf
deleted file mode 100644
index 332d38fad..000000000
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5/ccimx6qpsbc/main.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[General]
-
-# Default adapter name
-# Defaults to 'BlueZ X.YZ'
-Name = cc6qp
-
-[Policy]
-
-# AutoEnable defines option to enable all controllers when they are found.
-# This includes adapters present on start as well as adapters that are plugged
-# in later on. Defaults to 'false'.
-AutoEnable=true
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5/ccimx6sbc/main.conf b/meta-digi-dey/recipes-connectivity/bluez/bluez5/ccimx6sbc/main.conf
index c0908f0b2..69561c2c8 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5/ccimx6sbc/main.conf
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5/ccimx6sbc/main.conf
@@ -2,7 +2,7 @@
 
 # Default adapter name
 # Defaults to 'BlueZ X.YZ'
-Name = cc6
+Name = ##BT_DEVICE_NAME##
 
 #[Policy]
 
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5/ccimx6ul/main.conf b/meta-digi-dey/recipes-connectivity/bluez/bluez5/ccimx6ul/main.conf
deleted file mode 100644
index e3c0cacbc..000000000
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5/ccimx6ul/main.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[General]
-
-# Default adapter name
-# Defaults to 'BlueZ X.YZ'
-Name = cc6ul
-
-[Policy]
-
-# AutoEnable defines option to enable all controllers when they are found.
-# This includes adapters present on start as well as adapters that are plugged
-# in later on. Defaults to 'false'.
-AutoEnable=true
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8mn/main.conf b/meta-digi-dey/recipes-connectivity/bluez/bluez5/main.conf
similarity index 91%
rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8mn/main.conf
rename to meta-digi-dey/recipes-connectivity/bluez/bluez5/main.conf
index 6420f4b8b..404154322 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8mn/main.conf
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5/main.conf
@@ -2,7 +2,7 @@
 
 # Default adapter name
 # Defaults to 'BlueZ X.YZ'
-Name = cc8mn
+Name = ##BT_DEVICE_NAME##
 
 [Policy]
 
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend
index f85360423..d188cd039 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend
@@ -40,6 +40,8 @@ do_install_append() {
 	install -d ${D}${systemd_unitdir}/system/
 	install -m 0644 ${WORKDIR}/bluetooth-init.service ${D}${systemd_unitdir}/system/bluetooth-init.service
 	install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/bluetooth/
+	sed -i -e "s,##BT_DEVICE_NAME##,${BT_DEVICE_NAME},g" \
+		${D}${sysconfdir}/bluetooth/main.conf
 	if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'experimental', 'experimental', '', d)}" ]; then
 		sed -i '/^SSD_OPTIONS/a SSD_OPTIONS="${SSD_OPTIONS} --experimental"' ${D}${INIT_D_DIR}/bluetooth
 	fi
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.50.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.50.bbappend
index 0d8bbb09b..64f5d498f 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.50.bbappend
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.50.bbappend
@@ -33,6 +33,8 @@ do_install_append() {
 	install -d ${D}${systemd_unitdir}/system/
 	install -m 0644 ${WORKDIR}/bluetooth-init.service ${D}${systemd_unitdir}/system/bluetooth-init.service
 	install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/bluetooth/
+	sed -i -e "s,##BT_DEVICE_NAME##,${BT_DEVICE_NAME},g" \
+		${D}${sysconfdir}/bluetooth/main.conf
 
 	# Staging bluetooth internal headers and libs to allow other recipes
 	# to link against them