diff --git a/toolkit/perfsonar-toolkit/etc/configdaemon.conf b/toolkit/perfsonar-toolkit/etc/configdaemon.conf
index 76b39f95..bd181987 100644
--- a/toolkit/perfsonar-toolkit/etc/configdaemon.conf
+++ b/toolkit/perfsonar-toolkit/etc/configdaemon.conf
@@ -1,4 +1,4 @@
-address     127.0.0.1
+address     localhost
 port        9000
 firewall_script /usr/lib/perfsonar/scripts/system_environment/configure_firewall
 
diff --git a/toolkit/perfsonar-toolkit/scripts/system_environment/upgrade_configdaemon b/toolkit/perfsonar-toolkit/scripts/system_environment/upgrade_configdaemon
index 1456288a..d9f14b15 100755
--- a/toolkit/perfsonar-toolkit/scripts/system_environment/upgrade_configdaemon
+++ b/toolkit/perfsonar-toolkit/scripts/system_environment/upgrade_configdaemon
@@ -34,7 +34,7 @@ if [ $UPDATE_CONFIG -eq 1 ]; then
 
 echo "Replacing /etc/perfsonar/toolkit/configdaemon.conf"
 cat > /etc/perfsonar/toolkit/configdaemon.conf <<- EOF
-address     127.0.0.1
+address     localhost
 port        9000
 firewall_script /usr/lib/perfsonar/scripts/system_environment/configure_firewall