diff --git a/glorytun-tcp-post.sh b/glorytun-tcp-post.sh
index e993b04..eb3eace 100644
--- a/glorytun-tcp-post.sh
+++ b/glorytun-tcp-post.sh
@@ -3,8 +3,8 @@
 . "$(readlink -f "$1")"
 
 INTF=gt-${DEV}
-[ -z "$LOCALIP" ] && LOCALIP="10.255.255.1"
-[ -z "$BROADCASTIP" ] && BROADCASTIP="10.255.255.3"
+[ -z "$LOCALIP" ] && LOCALIP="172.255.255.1"
+[ -z "$BROADCASTIP" ] && BROADCASTIP="172.255.255.3"
 while [ -z "$(ip link show $INTF 2>/dev/null)" ]; do
 	sleep 2
 done
diff --git a/glorytun-udp-post.sh b/glorytun-udp-post.sh
index 51a20f0..725b5f9 100644
--- a/glorytun-udp-post.sh
+++ b/glorytun-udp-post.sh
@@ -3,8 +3,8 @@
 . "$(readlink -f "$1")"
 
 INTF=gt-udp-${DEV}
-[ -z "$LOCALIP" ] && LOCALIP="10.255.254.1"
-[ -z "$BROADCASTIP" ] && BROADCASTIP="10.255.254.3"
+[ -z "$LOCALIP" ] && LOCALIP="172.255.254.1"
+[ -z "$BROADCASTIP" ] && BROADCASTIP="172.255.254.3"
 while [ -z "$(ip link show $INTF 2>/dev/null)" ]; do
 	sleep 2
 done
diff --git a/glorytun-udp.network b/glorytun-udp.network
index db29038..a3c5505 100644
--- a/glorytun-udp.network
+++ b/glorytun-udp.network
@@ -3,7 +3,7 @@ Name=gt-udp-tun*
 
 [Network]
 Description=Glorytun server device
-Address=10.255.254.1/24
+Address=172.255.254.1/24
 DHCPServer=yes
 IPMasquerade=yes
 
diff --git a/glorytun.network b/glorytun.network
index 85ba096..a1d5231 100644
--- a/glorytun.network
+++ b/glorytun.network
@@ -6,7 +6,7 @@ MTUBytes=1500
 
 [Network]
 Description=Glorytun server device
-Address=10.255.255.1/24
+Address=172.255.255.1/24
 DHCPServer=yes
 IPMasquerade=yes
 
diff --git a/omr-pihole.sh b/omr-pihole.sh
index bfffd4a..bb2a2ee 100644
--- a/omr-pihole.sh
+++ b/omr-pihole.sh
@@ -25,8 +25,8 @@ echo "Done"
 echo "-------------------------------------------------------------------------------------------------------------------------------"
 echo "OMR Pi-hole configuration..."
 cat > /etc/lighttpd/external.conf << 'EOF'
-server.bind="10.255.255.1"
-$SERVER["socket"] == "10.255.254.1:80" { }
+server.bind="172.255.255.1"
+$SERVER["socket"] == "172.255.254.1:80" { }
 $SERVER["socket"] == "10.255.252.1:80" { }
 $SERVER["socket"] == "10.255.251.1:80" { }
 $SERVER["socket"] == "10.255.253.1:80" { }
@@ -54,6 +54,6 @@ systemctl -q restart pihole-FTL
 echo "Done"
 echo "======================================================================================================================================"
 echo "To use Pi-hole in OpenMPTCProuter, you need to 'Save & Apply' the wizard again in System->OpenMPTCProuter then reboot OpenMPTCProuter."
-echo "Web interface will be available on 10.255.255.1 if you use Glorytun TCP, 10.255.254.1 if you use Glorytun UDP."
+echo "Web interface will be available on 172.255.255.1 if you use Glorytun TCP, 172.255.254.1 if you use Glorytun UDP."
 echo "======================================================================================================================================"
 exit 0
\ No newline at end of file
diff --git a/omr-service b/omr-service
index 3898c5d..aaa0357 100755
--- a/omr-service
+++ b/omr-service
@@ -39,7 +39,7 @@ _glorytun_tcp() {
 		done
 		if [ -f /etc/openmptcprouter-vps-admin/current-vpn ] && [ "$(cat /etc/openmptcprouter-vps-admin/current-vpn)" = "glorytun_tcp" ]; then
 			localip="$(cat /etc/glorytun-tcp/tun0 | grep LOCALIP | cut -d '=' -f2)"
-			[ -z "$localip" ] && localip="10.255.255.1"
+			[ -z "$localip" ] && localip="172.255.255.1"
 			remoteip="$(echo $localip | sed 's/\.1/\.2/')"
 			if [ "$(ping -c 5 -w 5 $remoteip | grep '100%')" != "" ] && ([ -z "$(pgrep glorytun-tcp)" ] || [ "$(expr $(date +%s) - $(stat -c %Y /proc/$(pgrep glorytun-tcp)/exe ))" -gt "300" ]); then
 				logger -t "OMR-Service" "No answer from VPN client end, restart Glorytun-TCP"
diff --git a/shorewall4/params.vpn b/shorewall4/params.vpn
index e4082cb..c8808a6 100644
--- a/shorewall4/params.vpn
+++ b/shorewall4/params.vpn
@@ -1,3 +1,3 @@
-VPS_ADDR=10.255.255.1
-OMR_ADDR=10.255.255.2
+VPS_ADDR=172.255.255.1
+OMR_ADDR=172.255.255.2
 VPS_IFACE=gt-tun0
diff --git a/shorewall4/snat b/shorewall4/snat
index 8435e40..f8a58fc 100644
--- a/shorewall4/snat
+++ b/shorewall4/snat
@@ -21,8 +21,8 @@ MASQUERADE		10.255.247.0/24,\
 			10.255.251.0/24,\
 			10.255.252.0/24,\
 			10.255.253.0/24,\
-			10.255.254.0/24,\
-			10.255.255.0/24,\
+			172.255.254.0/24,\
+			172.255.255.0/24,\
 			169.254.0.0/16,\
 			172.16.0.0/12,\
 			192.168.0.0/16		$NET_IFACE