diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dd3bbf058..89227b20e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
   build:
     strategy:
       matrix:
-        OMR_TARGET: [bpi-r1, bpi-r2, bpi-r64, rpi2, rpi4, wrt32x, espressobin, r2s, rpi3, wrt3200acm, x86, x86_64, ubnt-erx, r4s, r7800, rutx12, rutx50, r5s, qnap-301w]
+        OMR_TARGET: [bpi-r1, bpi-r2, bpi-r64, rpi2, rpi4, wrt32x, espressobin, r2s, rpi3, wrt3200acm, x86, x86_64, ubnt-erx, r4s, r7800, rutx12, rutx50, r5s, qnap-301w, rpi5]
         OMR_KERNEL: [5.4, 6.1]
     runs-on: ubuntu-latest
     continue-on-error: true
diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 939a0ed7b..0b3512f6e 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -2168,12 +2168,12 @@ _config_service() {
 			return
 		fi
 	fi
-	[ "$(uci -q get openmptcprouter.${servername}.get_config)" = "1" ] && [ "$(uci -q get openmptcprouter.${servername}.master)" = "1" ] && {
+	[ "$(uci -q get openmptcprouter.${servername}.get_config)" = "1" ] && ([ "$(uci -q get openmptcprouter.${servername}.master)" = "1" ] || [ "$(uci -q get openmptcprouter.${servername}.current)" = "1" ]) && {
 		_set_config_from_vps
 		_get_gre_tunnel
 	}
 
-	[ "$(uci -q get openmptcprouter.${servername}.master)" = "1" ] && {
+	([ "$(uci -q get openmptcprouter.${servername}.master)" = "1" ] || [ "$(uci -q get openmptcprouter.${servername}.current)" = "1" ]) && {
 		_get_vps_config
 	}
 
diff --git a/xray-core/files/etc/init.d/xray b/xray-core/files/etc/init.d/xray
index d69dcc585..3fa53a12f 100755
--- a/xray-core/files/etc/init.d/xray
+++ b/xray-core/files/etc/init.d/xray
@@ -2244,7 +2244,7 @@ start_instance() {
 }
 
 rules_exist() {
-	[ -n "$(iptables -w -t nat -L -n 2>/dev/null | grep v2r_)" ] && return 0
+	[ -n "$(iptables -w -t nat -L -n 2>/dev/null | grep xr_)" ] && return 0
 	return 1
 }