diff --git a/cmake/templates/BuildInfo.h.in b/cmake/templates/BuildInfo.h.in
index a047cdfaf22..99e7ebc3fa8 100644
--- a/cmake/templates/BuildInfo.h.in
+++ b/cmake/templates/BuildInfo.h.in
@@ -13,24 +13,22 @@
 
 #define USE_STABLE_GLOBAL_SERVICES @USE_STABLE_GLOBAL_SERVICES@
 
-#include <QString>
-
 namespace BuildInfo {
     // WARNING: This file has been auto-generated.
     // Check cmake/templates/BuildInfo.h.in if you want to modify it.
 
-    const QString INTERFACE_NAME = "Interface";
-    const QString ASSIGNMENT_CLIENT_NAME = "assignment-client";
-    const QString DOMAIN_SERVER_NAME = "domain-server";
-    const QString AC_CLIENT_SERVER_NAME = "ac-client";
-    const QString MODIFIED_ORGANIZATION = "@BUILD_ORGANIZATION@";
-    const QString ORGANIZATION_DOMAIN = "overte.org";
-    const QString VERSION = "@BUILD_VERSION@";
-    const QString BUILD_NUMBER = "@BUILD_VERSION_NO_SHA@";
-    const QString BUILD_GLOBAL_SERVICES = "@BUILD_GLOBAL_SERVICES@";
-    const QString BUILD_TIME = "@BUILD_DATE@";
-    const QString PRELOADED_STARTUP_LOCATION = "@PRELOADED_STARTUP_LOCATION@";
-    const QString PRELOADED_SCRIPT_ALLOWLIST = "@PRELOADED_SCRIPT_ALLOWLIST@";
+    constexpr char INTERFACE_NAME[] = "Interface";
+    constexpr char ASSIGNMENT_CLIENT_NAME[] = "assignment-client";
+    constexpr char DOMAIN_SERVER_NAME[] = "domain-server";
+    constexpr char AC_CLIENT_SERVER_NAME[] = "ac-client";
+    constexpr char MODIFIED_ORGANIZATION[] = "@BUILD_ORGANIZATION@";
+    constexpr char ORGANIZATION_DOMAIN[] = "overte.org";
+    constexpr char VERSION[] = "@BUILD_VERSION@";
+    constexpr char BUILD_NUMBER[] = "@BUILD_VERSION_NO_SHA@";
+    constexpr char BUILD_GLOBAL_SERVICES[] = "@BUILD_GLOBAL_SERVICES@";
+    constexpr char BUILD_TIME[] = "@BUILD_DATE@";
+    constexpr char PRELOADED_STARTUP_LOCATION[] = "@PRELOADED_STARTUP_LOCATION@";
+    constexpr char PRELOADED_SCRIPT_ALLOWLIST[] = "@PRELOADED_SCRIPT_ALLOWLIST@";
 
     enum BuildType {
         Dev,
@@ -40,17 +38,17 @@ namespace BuildInfo {
     };
 
 #if defined(PR_BUILD)
-    const BuildType BUILD_TYPE = PR;
-    const QString BUILD_TYPE_STRING = "pr";
+    constexpr BuildType BUILD_TYPE = PR;
+    constexpr char BUILD_TYPE_STRING[] = "pr";
 #elif defined(PRODUCTION_BUILD)
-    const BuildType BUILD_TYPE = Stable;
-    const QString BUILD_TYPE_STRING = "stable";
+    constexpr BuildType BUILD_TYPE = Stable;
+    constexpr char BUILD_TYPE_STRING[] = "stable";
 #elif defined(NIGHTLY_BUILD)
-    const BuildType BUILD_TYPE = Nightly;
-    const QString BUILD_TYPE_STRING = "nightly";
+    constexpr BuildType BUILD_TYPE = Nightly;
+    constexpr char BUILD_TYPE_STRING[] = "nightly";
 #else
-    const BuildType BUILD_TYPE = Dev;
-    const QString BUILD_TYPE_STRING = "dev";
+    constexpr BuildType BUILD_TYPE = Dev;
+    constexpr char BUILD_TYPE_STRING[] = "dev";
 #endif
 
 }
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 0c656d209a9..e5e0db46fa9 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -21,6 +21,7 @@
 #include <QtNetwork/QLocalServer>
 #include <QtQuick/QQuickWindow>
 #include <QWidget>
+#include <string_view>
 
 #include <AccountManager.h>
 #include <AddressManager.h>
@@ -1615,7 +1616,7 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
 
     // If this is a first run we short-circuit the address passed in
     if (_firstRun.get()) {
-        if (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty()) {
+        if (!std::string_view(BuildInfo::PRELOADED_STARTUP_LOCATION).empty()) {
             DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(NetworkingConstants::DEFAULT_OVERTE_ADDRESS);
             Menu::getInstance()->triggerOption(MenuOption::HomeLocation);
         }
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 94ff1e72c38..c48b3b91177 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -38,10 +38,10 @@ const QString REDIRECT_HIFI_ADDRESS = NetworkingConstants::REDIRECT_HIFI_ADDRESS
 const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager";
 const QString SETTINGS_CURRENT_ADDRESS_KEY = "address";
 
-const QString DEFAULT_OVERTE_ADDRESS = (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty())
+const QString DEFAULT_OVERTE_ADDRESS = (!std::string_view(BuildInfo::PRELOADED_STARTUP_LOCATION).empty())
                                        ? BuildInfo::PRELOADED_STARTUP_LOCATION
                                        : NetworkingConstants::DEFAULT_OVERTE_ADDRESS;
-const QString DEFAULT_HOME_ADDRESS = (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty())
+const QString DEFAULT_HOME_ADDRESS = (!std::string_view(BuildInfo::PRELOADED_STARTUP_LOCATION).empty())
                                        ? BuildInfo::PRELOADED_STARTUP_LOCATION
                                        : NetworkingConstants::DEFAULT_OVERTE_ADDRESS;