diff --git a/omr-tracker/files/bin/omr-tracker-server b/omr-tracker/files/bin/omr-tracker-server
index fafb3e3db..68e1164eb 100755
--- a/omr-tracker/files/bin/omr-tracker-server
+++ b/omr-tracker/files/bin/omr-tracker-server
@@ -182,6 +182,11 @@ _check_master() {
 							set shadowsocks-libev.sss${count}.disabled=0
 						EOF
 					fi
+					if [ -z "$(uci -q get openvpn.omr.remote | grep $ip)" ]; then
+						uci -q batch <<-EOF >/dev/null
+							add_list openvpn.omr.remote=$ip
+						EOF
+					fi
 					if [ "$count" -eq "0" ]; then
 						config_load openmptcprouter
 						config_foreach _disable_current server
@@ -260,6 +265,13 @@ _check_master() {
 				config_foreach _get_server_name server $ip
 				[ -n "$servername" ] && config_foreach _disable_redir ss_redir $servername "shadowsocks-rust"
 
+				if [ -n "$(uci -q get openvpn.omr.remote | grep $ip)" ]; then
+					uci -q batch <<-EOF >/dev/null
+						del_list openvpn.omr.remote=$ip
+					EOF
+				fi
+
+
 				OMR_TRACKER_STATUS_MSG="No answer to ping and to API check"
 				mail_alert="$(uci -q get omr-tracker.server.mail_alert)"
 				#[ -z "$mail_alert" ] && mail_alert="$(uci -q get omr-tracker.defaults.mail_alert)"
@@ -297,11 +309,14 @@ _check_master() {
 		fi
 		[ -n "$(uci changes shadowsocks-libev)" ] && changes="1"
 		[ -n "$(uci changes shadowsocks-rust)" ] && changes="1"
+		[ -n "$(uci changes openvpn)" ] && changes="1"
 		uci -q commit shadowsocks-libev
 		uci -q commit shadowsocks-rust
+		uci -q commit openvpn
 		[ "$changes" = "1" ] && {
 			/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
 			/etc/init.d/shadowsocks-rust restart >/dev/null 2>/dev/null
+			/etc/init.d/openvpn restart omr >/dev/null 2>/dev/null
 		}
 		break
 	}
diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile
index 8088117d4..69c68783c 100644
--- a/openmptcprouter-full/Makefile
+++ b/openmptcprouter-full/Makefile
@@ -76,7 +76,7 @@ MY_DEPENDS := \
     !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-serial !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-serial-option !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-serial-wwan !(TARGET_mvebu||TARGET_ipq40xx):usb-modeswitch !TARGET_mvebu:uqmi \
     !TARGET_mvebu:umbim !TARGET_mvebu:kmod-mii !TARGET_mvebu:kmod-usb-net !TARGET_mvebu:kmod-usb-wdm !TARGET_mvebu:kmod-usb-net-qmi-wwan !TARGET_mvebu:kmod-usb-net-cdc-mbim !TARGET_mvebu:umbim \
     !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-huawei-cdc-ncm !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-rndis !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-cdc-ether !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-ipheth !(TARGET_mvebu||TARGET_ipq40xx):usbmuxd !(TARGET_mvebu||TARGET_ipq40xx):libusbmuxd \
-    !TARGET_mvebu:luci-proto-qmi wpad-openssl !(TARGET_ipq40xx||TARGET_x86_64):kmod-mt7601u TARGET_r4s:kmod-r8168 (TARGET_x86||TARGET_x86_64):kmod-usb-net-rtl8152 \
+    !TARGET_mvebu:luci-proto-qmi wpad-openssl libopenssl-legacy !(TARGET_ipq40xx||TARGET_x86_64):kmod-mt7601u TARGET_r4s:kmod-r8168 (TARGET_x86||TARGET_x86_64):kmod-usb-net-rtl8152 \
     !TARGET_mvebu:luci-app-mlvpn !TARGET_mvebu:mlvpn 464xlat kmod-zram kmod-swconfig swconfig kmod-ipt-nat kmod-ipt-nat6 luci-app-https-dns-proxy kmod-tcp-nanqinlang iptables-mod-ipopt igmpproxy ss iptraf-ng \
     luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp luci-proto-gre tcptraceroute luci-proto-mbim !TARGET_x86_64:kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard kmod-usb2 libustream-openssl (TARGET_x86||TARGET_x86_64):kmod-ixgbevf (TARGET_x86||TARGET_x86_64):kmod-igbvf \
     hwinfo (TARGET_x86||TARGET_x86_64):dmidecode kmod-bonding luci-proto-bonding luci-app-sysupgrade \
diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index b32bfe3a7..01535efd5 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -560,9 +560,10 @@ _get_vps_config() {
 			/etc/init.d/xray restart
 		fi
 	fi
-	if [ -n "$(uci -q get openvpn.omr)" ] && [ "$(uci -q get openvpn.omr.remote)" != "127.0.0.1" ] && [ "$(uci -q get openvpn.omr.remote)" != "$vpsip" ] && [ "$(uci -q get openmptcprouter.settings.ha)" != "1" ]; then
+	if [ -n "$(uci -q get openvpn.omr)" ] && [ "$(uci -q get openvpn.omr.remote)" != "127.0.0.1" ] && [ -z "$(uci -q get openvpn.omr.remote | grep $vpsip)" ] && [ "$(uci -q get openmptcprouter.settings.ha)" != "1" ]; then
 		uci -q batch <<-EOF >/dev/null
-			set openvpn.omr.remote="$vpsip"
+			delete openvpn.omr.remote
+			add_list openvpn.omr.remote="$vpsip"
 			commit openvpn
 		EOF
 		if [ "$(uci -q get openvpn.omr.enabled)" = "1" ]; then
@@ -1822,8 +1823,8 @@ _set_config_from_vps() {
 			set openvpn.omr.client=1
 			set openvpn.omr.allow_recursive_routing=1
 		EOF
-		if [ "$(uci -q get openvpn.omr.remote)" != "127.0.0.1" ]; then
-			uci -q set openvpn.omr.remote="$vpsip"
+		if [ -z "$(uci -q get openvpn.omr.remote | grep $vpsip)" ]; then
+			uci -q add_list openvpn.omr.remote="$vpsip"
 		fi
 		uci -q commit openvpn
 		logger -t "OMR-VPS" "OpenVPN restart..."