1 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
index ef0f4882f1c..96c80c57ab2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
@@ -52,7 +52,7 @@ public class ConfigserverCluster extends AbstractConfigProducer
 
     @Override
     public void getConfig(ZookeeperServerConfig.Builder builder) {
-        String myhostname = HostName.getLocalhost();
+        String myhostname = HostName.getHostName();
         int myid = 0;
         int i = 0;
         for (ConfigServer server : getConfigServers()) {
@@ -115,7 +115,7 @@ public class ConfigserverCluster extends AbstractConfigProducer
             builder.defaultContentFlavor(options.defaultContentFlavor().get());
         }
 
-        builder.serverId(HostName.getLocalhost());
+        builder.serverId(HostName.getHostName());
         if (!containerCluster.getHttp().getHttpServer().getConnectorFactories().isEmpty()) {
             builder.httpport(containerCluster.getHttp().getHttpServer().getConnectorFactories().get(0).getListenPort());
         }
@@ -144,7 +144,7 @@ public class ConfigserverCluster extends AbstractConfigProducer
         if (options.allConfigServers().length > 0) {
             return options.allConfigServers();
         } else {
-            return new ConfigServer[]{new ConfigServer(HostName.getLocalhost(), Optional.<Integer>empty()) };
+            return new ConfigServer[]{new ConfigServer(HostName.getHostName(), Optional.<Integer>empty()) };
         }
     }