diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
index a61deeef96..1f43428b4c 100644
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -4,6 +4,7 @@
 //
 //  Created by Stephen Birarda on 2/15/13.
 //  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -37,6 +38,7 @@
 #include <SharedUtil.h>
 
 #include "DomainHandler.h"
+#include "NetworkingConstants.h"
 #include "Node.h"
 #include "NLPacket.h"
 #include "NLPacketList.h"
@@ -55,8 +57,8 @@ static const size_t DEFAULT_MAX_CONNECTION_RATE { std::numeric_limits<size_t>::m
 
 const char DEFAULT_ASSIGNMENT_SERVER_HOSTNAME[] = "localhost";
 
-const char STUN_SERVER_HOSTNAME[] = "stun.highfidelity.io";
-const unsigned short STUN_SERVER_PORT = 3478;
+const char STUN_SERVER_HOSTNAME = NetworkingConstants::STUN_SERVER_DEFAULT_HOSTNAME.toUtf8().constData();
+const unsigned short STUN_SERVER_PORT = NetworkingConstants::STUN_SERVER_DEFAULT_PORT;
 
 const QString DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY = "domain-server.local-port";
 const QString DOMAIN_SERVER_LOCAL_HTTP_PORT_SMEM_KEY = "domain-server.local-http-port";
diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h
index ede95830c6..4d03179f57 100644
--- a/libraries/networking/src/NetworkingConstants.h
+++ b/libraries/networking/src/NetworkingConstants.h
@@ -47,9 +47,15 @@ namespace NetworkingConstants {
     const QString PUBLIC_BUCKET_CDN_URL = "https://hifi-public.s3.amazonaws.com/";
 
 #if USE_STABLE_GLOBAL_SERVICES
-    const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.highfidelity.com";
+    const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.vircadia.com";
+
+    const QString STUN_SERVER_DEFAULT_HOSTNAME = "stun1.l.google.com";
+    const unsigned short STUN_SERVER_DEFAULT_PORT = 19302;
 #else
-    const QString ICE_SERVER_DEFAULT_HOSTNAME = "dev-ice.highfidelity.com";
+    const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.vircadia.com";
+
+    const QString STUN_SERVER_DEFAULT_HOSTNAME = "stun2.l.google.com";
+    const unsigned short STUN_SERVER_DEFAULT_PORT = 19302;
 #endif
 
     const QString MARKETPLACE_CDN_HOSTNAME = "mpassets.highfidelity.com";