diff --git a/roles/bluetooth/templates/bt-pan.service.j2 b/roles/bluetooth/templates/bt-pan.service.j2
index 56a1a6bdf..8512bec1b 100644
--- a/roles/bluetooth/templates/bt-pan.service.j2
+++ b/roles/bluetooth/templates/bt-pan.service.j2
@@ -1,9 +1,13 @@
 [Unit]
 Description=Bluetooth NEP PAN
-After=br0.network
+#After=br0.network
+Before=network.target
+After=network-pre.target
+Requires=network-pre.target
 
 [Service]
 ExecStart=/usr/bin/bt-network -s nap br0
+ExecStartPost=/usr/local/bin/iiab-bt-pan-discoverable-on
 Type=simple
 
 [Install]
diff --git a/roles/bluetooth/templates/iiab-bt-pan-discoverable-on.j2 b/roles/bluetooth/templates/iiab-bt-pan-discoverable-on.j2
new file mode 100644
index 000000000..fc6030e7c
--- /dev/null
+++ b/roles/bluetooth/templates/iiab-bt-pan-discoverable-on.j2
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+bluetoothctl <<EOF
+discoverable on
+EOF