diff --git a/template_configs/devices/docker-devices.rules b/template_configs/devices/docker-devices.rules
index 5afb924ea42894b15bfe96f45b70471511d61d8c..d5dee285a50c0690e9fdac5e8fa50c7dece2bc37 100644
--- a/template_configs/devices/docker-devices.rules
+++ b/template_configs/devices/docker-devices.rules
@@ -1,4 +1,4 @@
 # IDs of USB devices may be found with lsusb
  
 # Aeotec Z-Stick Gen5
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0658", ATTRS{idProduct}=="0200", GROUP="dialout", MODE="0666", SYMLINK+="zwave_stick"
+SUBSYSTEM=="tty", ATTRS{idVendor}=="0658", ATTRS{idProduct}=="0200", GROUP="dialout", MODE="0666", SYMLINK+="zwave_stick"
diff --git a/template_configs/devices/enable-swarm-device b/template_configs/devices/enable-swarm-device
index 1e04a05839f973e19e47445cc20c3a563fac2f6b..4e55a30a5059a9e1a181fc692a790251707856c1 100755
--- a/template_configs/devices/enable-swarm-device
+++ b/template_configs/devices/enable-swarm-device
@@ -16,3 +16,5 @@ if [[ -z $CID ]]; then
 fi
 echo "Setting permissions to access $1 for container $2"
 echo "c $dmajor:$dminor rwm" > /sys/fs/cgroup/devices/docker/$CID/devices.allow
+echo "Creating node inside container"
+docker exec $CID mknod /dev/$1 c $dmajor $dminor -m 0666