diff --git a/modules/openapi-generator/src/test/resources/3_0/cpp-qt/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/cpp-qt/petstore.yaml
index 0d98a3be3c9..ea98eb54e12 100644
--- a/modules/openapi-generator/src/test/resources/3_0/cpp-qt/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/cpp-qt/petstore.yaml
@@ -530,6 +530,8 @@ paths:
     put:
       tags:
         - user
+      servers:
+        - url: http://user.petstore.swagger.io/v2
       summary: Updated user
       description: This can only be done by the logged in user.
       operationId: updateUser
@@ -572,6 +574,7 @@ paths:
           description: User not found
 servers:
   - url: http://petstore.swagger.io/v2
+  - url: http://localhost:8080/v2
 components:
   requestBodies:
     UserArray:
diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.cpp
index 88e40e79d1c..071d160a696 100644
--- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.cpp
+++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.cpp
@@ -35,6 +35,10 @@ void PFXPetApi::initializeServerConfigs() {
     QUrl("http://petstore.swagger.io/v2"),
     "No description provided",
     QMap<QString, PFXServerVariable>()));
+    defaultConf.append(PFXServerConfiguration(
+    QUrl("http://localhost:8080/v2"),
+    "No description provided",
+    QMap<QString, PFXServerVariable>()));
     _serverConfigs.insert("addPet", defaultConf);
     _serverIndices.insert("addPet", 0);
     _serverConfigs.insert("allPets", defaultConf);
diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPrimitivesApi.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPrimitivesApi.cpp
index 2171cb0c500..ac9b0d4a41d 100644
--- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPrimitivesApi.cpp
+++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPrimitivesApi.cpp
@@ -35,6 +35,10 @@ void PFXPrimitivesApi::initializeServerConfigs() {
     QUrl("http://petstore.swagger.io/v2"),
     "No description provided",
     QMap<QString, PFXServerVariable>()));
+    defaultConf.append(PFXServerConfiguration(
+    QUrl("http://localhost:8080/v2"),
+    "No description provided",
+    QMap<QString, PFXServerVariable>()));
     _serverConfigs.insert("primitivesIntegerPost", defaultConf);
     _serverIndices.insert("primitivesIntegerPost", 0);
     _serverConfigs.insert("primitivesNumberPut", defaultConf);
diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXStoreApi.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXStoreApi.cpp
index 68711efe12e..eddb89813c2 100644
--- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXStoreApi.cpp
+++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXStoreApi.cpp
@@ -35,6 +35,10 @@ void PFXStoreApi::initializeServerConfigs() {
     QUrl("http://petstore.swagger.io/v2"),
     "No description provided",
     QMap<QString, PFXServerVariable>()));
+    defaultConf.append(PFXServerConfiguration(
+    QUrl("http://localhost:8080/v2"),
+    "No description provided",
+    QMap<QString, PFXServerVariable>()));
     _serverConfigs.insert("deleteOrder", defaultConf);
     _serverIndices.insert("deleteOrder", 0);
     _serverConfigs.insert("getInventory", defaultConf);
diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUserApi.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUserApi.cpp
index 1e7b6b470cc..567500c481b 100644
--- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUserApi.cpp
+++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUserApi.cpp
@@ -35,6 +35,10 @@ void PFXUserApi::initializeServerConfigs() {
     QUrl("http://petstore.swagger.io/v2"),
     "No description provided",
     QMap<QString, PFXServerVariable>()));
+    defaultConf.append(PFXServerConfiguration(
+    QUrl("http://localhost:8080/v2"),
+    "No description provided",
+    QMap<QString, PFXServerVariable>()));
     _serverConfigs.insert("createUser", defaultConf);
     _serverIndices.insert("createUser", 0);
     _serverConfigs.insert("createUsersWithArrayInput", defaultConf);
@@ -49,8 +53,15 @@ void PFXUserApi::initializeServerConfigs() {
     _serverIndices.insert("loginUser", 0);
     _serverConfigs.insert("logoutUser", defaultConf);
     _serverIndices.insert("logoutUser", 0);
-    _serverConfigs.insert("updateUser", defaultConf);
-    _serverIndices.insert("updateUser", 0);
+    {
+        QList<PFXServerConfiguration> serverConf = QList<PFXServerConfiguration>();
+        serverConf.append(PFXServerConfiguration(
+        QUrl("http://user.petstore.swagger.io/v2"),
+        "No description provided",
+        QMap<QString, PFXServerVariable>()));
+        _serverConfigs.insert("updateUser", serverConf);
+        _serverIndices.insert("updateUser", 0);
+    }
 }
 
 /**
diff --git a/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp b/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp
index ab5bc83996a..ff602c656f8 100644
--- a/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp
+++ b/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp
@@ -35,6 +35,10 @@ void PFXPetApi::initializeServerConfigs() {
     QUrl("http://petstore.swagger.io/v2"),
     "No description provided",
     QMap<QString, PFXServerVariable>()));
+    defaultConf.append(PFXServerConfiguration(
+    QUrl("http://localhost:8080/v2"),
+    "No description provided",
+    QMap<QString, PFXServerVariable>()));
     _serverConfigs.insert("addPet", defaultConf);
     _serverIndices.insert("addPet", 0);
     _serverConfigs.insert("allPets", defaultConf);
diff --git a/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.cpp b/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.cpp
index 789531ab8b6..ab48ad85781 100644
--- a/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.cpp
+++ b/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.cpp
@@ -35,6 +35,10 @@ void PFXPrimitivesApi::initializeServerConfigs() {
     QUrl("http://petstore.swagger.io/v2"),
     "No description provided",
     QMap<QString, PFXServerVariable>()));
+    defaultConf.append(PFXServerConfiguration(
+    QUrl("http://localhost:8080/v2"),
+    "No description provided",
+    QMap<QString, PFXServerVariable>()));
     _serverConfigs.insert("primitivesIntegerPost", defaultConf);
     _serverIndices.insert("primitivesIntegerPost", 0);
     _serverConfigs.insert("primitivesNumberPut", defaultConf);
diff --git a/samples/client/petstore/cpp-qt/client/PFXStoreApi.cpp b/samples/client/petstore/cpp-qt/client/PFXStoreApi.cpp
index 5067733ee61..db8ad6b0de7 100644
--- a/samples/client/petstore/cpp-qt/client/PFXStoreApi.cpp
+++ b/samples/client/petstore/cpp-qt/client/PFXStoreApi.cpp
@@ -35,6 +35,10 @@ void PFXStoreApi::initializeServerConfigs() {
     QUrl("http://petstore.swagger.io/v2"),
     "No description provided",
     QMap<QString, PFXServerVariable>()));
+    defaultConf.append(PFXServerConfiguration(
+    QUrl("http://localhost:8080/v2"),
+    "No description provided",
+    QMap<QString, PFXServerVariable>()));
     _serverConfigs.insert("deleteOrder", defaultConf);
     _serverIndices.insert("deleteOrder", 0);
     _serverConfigs.insert("getInventory", defaultConf);
diff --git a/samples/client/petstore/cpp-qt/client/PFXUserApi.cpp b/samples/client/petstore/cpp-qt/client/PFXUserApi.cpp
index 042c9aab9a3..bd854b20594 100644
--- a/samples/client/petstore/cpp-qt/client/PFXUserApi.cpp
+++ b/samples/client/petstore/cpp-qt/client/PFXUserApi.cpp
@@ -35,6 +35,10 @@ void PFXUserApi::initializeServerConfigs() {
     QUrl("http://petstore.swagger.io/v2"),
     "No description provided",
     QMap<QString, PFXServerVariable>()));
+    defaultConf.append(PFXServerConfiguration(
+    QUrl("http://localhost:8080/v2"),
+    "No description provided",
+    QMap<QString, PFXServerVariable>()));
     _serverConfigs.insert("createUser", defaultConf);
     _serverIndices.insert("createUser", 0);
     _serverConfigs.insert("createUsersWithArrayInput", defaultConf);
@@ -49,8 +53,15 @@ void PFXUserApi::initializeServerConfigs() {
     _serverIndices.insert("loginUser", 0);
     _serverConfigs.insert("logoutUser", defaultConf);
     _serverIndices.insert("logoutUser", 0);
-    _serverConfigs.insert("updateUser", defaultConf);
-    _serverIndices.insert("updateUser", 0);
+    {
+        QList<PFXServerConfiguration> serverConf = QList<PFXServerConfiguration>();
+        serverConf.append(PFXServerConfiguration(
+        QUrl("http://user.petstore.swagger.io/v2"),
+        "No description provided",
+        QMap<QString, PFXServerVariable>()));
+        _serverConfigs.insert("updateUser", serverConf);
+        _serverIndices.insert("updateUser", 0);
+    }
 }
 
 /**