diff --git a/omr-tracker/files/etc/uci-defaults/omr-tracker b/omr-tracker/files/etc/uci-defaults/omr-tracker
new file mode 100755
index 000000000..e8d5e9fd3
--- /dev/null
+++ b/omr-tracker/files/etc/uci-defaults/omr-tracker
@@ -0,0 +1,8 @@
+#!/bin/sh
+uci -q batch <<-EOF
+    delete ucitrack.@omr-tracker[-1]
+    add ucitrack omr-tracker
+    set ucitrack.@omr-tracker[-1].init="omr-tracker"
+    add_list ucitrack.@network[-1].affects="omr-tracker"
+    commit ucitrack
+EOF
\ No newline at end of file
diff --git a/openmptcprouter/files/etc/uci-defaults/1950-omr b/openmptcprouter/files/etc/uci-defaults/1950-omr
index 135283984..fe14a1559 100755
--- a/openmptcprouter/files/etc/uci-defaults/1950-omr
+++ b/openmptcprouter/files/etc/uci-defaults/1950-omr
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 uci -q batch <<-EOF >/dev/null
-	set luci.diag.ping=openmptcprouter.com
-	set luci.diag.dns=openmptcprouter.com
-	set luci.diag.route=openmptcprouter.com
+	set luci.diag.ping="openmptcprouter.com"
+	set luci.diag.dns="openmptcprouter.com"
+	set luci.diag.route="openmptcprouter.com"
 	commit luci
 EOF
 rm -f /tmp/luci-indexcache