diff --git a/openwrt/openwrt-add-ipv4-vpn.sh b/openwrt/openwrt-add-ipv4-vpn.sh
index 9a824e3..32e56e8 100755
--- a/openwrt/openwrt-add-ipv4-vpn.sh
+++ b/openwrt/openwrt-add-ipv4-vpn.sh
@@ -13,9 +13,6 @@ fi
 my_ip=$1; shift
 my_wireguard_ip=$1; shift
 
-interface=ungleichipv4
-vpn_endpoint_host=vpn-18515529.ungleich.ch
-
 if [ $# -eq 1 ]; then
     private_key=$1; shift
 else
@@ -23,9 +20,21 @@ else
 fi
 public_key=$(echo $private_key | wg pubkey)
 
-vpn_endpoint_host=vpn-18515529.ungleich.ch
-vpn_endpoint_pubkey=6BRnQ+dmeFzVCH9RbM1pbJ7u3y3qrl+zUzzYCmC88kE=
+case $my_wireguard_ip in
+    185.155.29.*)
+        vpn_endpoint_pubkey=6BRnQ+dmeFzVCH9RbM1pbJ7u3y3qrl+zUzzYCmC88kE=
+    ;;
+    185.155.30.*)
+        vpn_endpoint_pubkey=5ach7pUQ57aa402LHz1MYh7lyBZS0GvBEw2PC6dMHW4=
+        ;;
+    *)
+        echo "Unknown VPN host for IP $my_wireguard_ip" >&2
+        exit 1
+        ;;
+esac
 
+interface="ip$(echo $my_wireguard_ip | awk -F. '{ print $1 $2 $3 $4 }')"
+vpn_endpoint_host=vpn-$(echo $my_wireguard_ip | awk -F. '{ print $1 $2 $3 }').ungleich.ch
 
 cat <<EOF | ssh -t "root@${my_ip}"
 set -x
@@ -64,7 +73,6 @@ fi
 # commit
 uci commit
 
-reboot
 EOF
 
 echo "Host ${my_ip} uses ip ${my_wireguard_ip} with public key ${public_key}"