diff --git a/lib.sh b/lib.sh
index 71f25cba..f9413959 100644
--- a/lib.sh
+++ b/lib.sh
@@ -41,8 +41,7 @@ IFACE=$(ip r | grep "default via" | awk '{print $5}')
 IFACE2=$(ip -o link show | awk '{print $2,$9}' | grep 'UP' | cut -d ':' -f 1)
 REPO=$(grep "^deb " /etc/apt/sources.list | grep http | awk '{print $2}' | head -1)
 ADDRESS=$(hostname -I | cut -d ' ' -f 1)
-# WANIP4=$(dig +short myip.opendns.com @resolver1.opendns.com) # as an alternative
-WANIP4=$(curl -s -k -m 5 -4 icanhazip.com)
+WANIP4=$(dig +short myip.opendns.com @resolver1.opendns.com)
 INTERFACES="/etc/netplan/nextcloud.yaml"
 GATEWAY=$(ip route | grep default | awk '{print $3}')
 # Internet DNS required when a check needs to be made to a server outside the home/SME
diff --git a/network/ddclient-configuration.sh b/network/ddclient-configuration.sh
index 5b8c1e20..250e837e 100644
--- a/network/ddclient-configuration.sh
+++ b/network/ddclient-configuration.sh
@@ -171,7 +171,7 @@ cat << DDCLIENT_CONF > "/etc/ddclient.conf"
 
 # Default system settings
 use=if, if=$IFACE
-use=web, web=$WANIP4
+use=web, web=https://api.ipify.org
 
 # DDNS-service specific setting
 # Provider=$PROVIDER