diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index 9426c7510..cc3c86773 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -159,3 +159,6 @@ BOOTABLE_ARTIFACTS = " \
 OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data"
 OVERLAYFS_ETC_DEVICE ?= "ubi1:data"
 OVERLAYFS_ETC_FSTYPE ?= "ubifs"
+
+# Bluetooth
+BT_TTY ?= "ttySTM1"
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index 0fc721cf3..368dfd8a6 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -172,3 +172,6 @@ BOOTABLE_ARTIFACTS = " \
 OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data"
 OVERLAYFS_ETC_DEVICE ?= "ubi1:data"
 OVERLAYFS_ETC_FSTYPE ?= "ubifs"
+
+# Bluetooth
+BT_TTY ?= "ttySTM1"
diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf
index c37e43b4e..c0e751c98 100644
--- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf
@@ -174,3 +174,6 @@ IMAGE_ROOTFS_MAXSIZE = "2621440"
 OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data"
 OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p11"
 OVERLAYFS_ETC_FSTYPE ?= "ext4"
+
+# Bluetooth
+BT_TTY ?= "ttySTM1"
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb
index 4d7c44468..b732f1e72 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb
@@ -28,6 +28,9 @@ do_install() {
 	install -d ${D}${sysconfdir}/init.d/
 	install -m 0755 ${WORKDIR}/${BT_INIT_FILE} ${D}${sysconfdir}/bluetooth-init
 	ln -sf /etc/bluetooth-init ${D}${sysconfdir}/init.d/bluetooth-init
+	# Set BT UART device
+	sed -i -e "s,##BT_TTY##,dev-${BT_TTY}.device,g" \
+                ${WORKDIR}/bluetooth-init.service
 	# SYSTEMD
 	install -d ${D}${systemd_unitdir}/system/
 	install -m 0644 ${WORKDIR}/bluetooth-init.service ${D}${systemd_unitdir}/system/bluetooth-init.service
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/bluetooth-init.service b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/bluetooth-init.service
index df97793b0..ce39deb7e 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/bluetooth-init.service
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/bluetooth-init.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Initialization of the bluetooth chip
 ConditionPathIsDirectory=/proc/device-tree/bluetooth
-After=systemd-udev-settle.service
+After=##BT_TTY##
 Before=bluetooth.service
 
 [Service]
diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ifupdown.service b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ifupdown.service
index 2672544f5..8438e4c96 100644
--- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ifupdown.service
+++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ifupdown.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Interface initialization via ifupdown
-After=systemd-udev-settle.service
-Requires=systemd-udev-settle.service
+After=systemd-udevd.service
+Wants=systemd-udevd.service
 
 [Service]
 Type=oneshot