diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java
index 4545dc24..3419b642 100755
--- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java
+++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java
@@ -68,7 +68,7 @@ public enum SupportedServer {
             Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14,
                     MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22,
                     MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33,
-                    MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60)
+                    MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50, MicroProfileVersion.MP60)
             , "%s.jar" //jarFileName
             , "" //jarParameters // Hard coded in server.xml since no way of overriding a default.
             , "9080" //portServiceA
diff --git a/src/test/resources/json_examples/v3/supportMatrix.json.segments b/src/test/resources/json_examples/v3/supportMatrix.json.segments
index b527a9f8..e165601a 100644
--- a/src/test/resources/json_examples/v3/supportMatrix.json.segments
+++ b/src/test/resources/json_examples/v3/supportMatrix.json.segments
@@ -2,4 +2,8 @@
 MP33":{"supportedServers":["
 "]},"MP32":{"supportedServers":["
 "]},"MP30":{"supportedServers":["
-]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}}
\ No newline at end of file
+]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEAL
+TH_CHECKS":"Health - Verify the health of your microservices with custom verifications",
+"REST_CLIENT":"Rest Client 
+- Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across
+ your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}}
\ No newline at end of file
diff --git a/src/test/resources/json_examples/v3/supportMatrix_servers.json.segments b/src/test/resources/json_examples/v3/supportMatrix_servers.json.segments
index ab03aee9..d4682bf5 100644
--- a/src/test/resources/json_examples/v3/supportMatrix_servers.json.segments
+++ b/src/test/resources/json_examples/v3/supportMatrix_servers.json.segments
@@ -18,4 +18,7 @@ MP12":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS"],
 MP12":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS"]
 "WILDFLY":{"
 MP33":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","OPEN_API","OPEN_TRACING","REST_CLIENT"]
-"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}}
\ No newline at end of file
+"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API document
+ation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications",
+"REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Prop
+agation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}}
\ No newline at end of file
diff --git a/src/test/resources/json_examples/v4/supportMatrix.json.segments b/src/test/resources/json_examples/v4/supportMatrix.json.segments
index f83b9176..1a63e069 100644
--- a/src/test/resources/json_examples/v4/supportMatrix.json.segments
+++ b/src/test/resources/json_examples/v4/supportMatrix.json.segments
@@ -1,4 +1,8 @@
 {"configs":{"
 MP33":{"supportedServers":["
 ]},"MP32":{"supportedServers":[
-]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}}
\ No newline at end of file
+]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEAL
+TH_CHECKS":"Health - Verify the health of your microservices with custom verifications",
+"REST_CLIENT":"Rest Client 
+- Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across
+ your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}}
\ No newline at end of file
diff --git a/src/test/resources/json_examples/v4/supportMatrix_servers.json.segments b/src/test/resources/json_examples/v4/supportMatrix_servers.json.segments
index 5da4b255..6ebcfc65 100644
--- a/src/test/resources/json_examples/v4/supportMatrix_servers.json.segments
+++ b/src/test/resources/json_examples/v4/supportMatrix_servers.json.segments
@@ -3,4 +3,9 @@ TOMEE":[{
 "mpVersion":"MP12","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS"],"javaSEVersions":["SE8"]},
 {"mpVersion":"MP13","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","OPEN_API","OPEN_TRACING","REST_CLIENT"],"javaSEVersions":["SE8"]},{
 ]},{"mpVersion":"MP30","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","OPEN_API","OPEN_TRACING","REST_CLIENT"],"javaSEVersions":["SE8","SE11"]},{"mpVersion":"
-]}]},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices
\ No newline at end of file
+]}]},"descriptions":{"CONFIG":"Configuration - 
+externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your mic
+roservices with custom verifications",
+"REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","
+FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing 
+- trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices
\ No newline at end of file
diff --git a/src/test/resources/json_examples/v5/supportMatrix.json.segments b/src/test/resources/json_examples/v5/supportMatrix.json.segments
index f83b9176..28ccb36a 100644
--- a/src/test/resources/json_examples/v5/supportMatrix.json.segments
+++ b/src/test/resources/json_examples/v5/supportMatrix.json.segments
@@ -1,4 +1,10 @@
 {"configs":{"
 MP33":{"supportedServers":["
 ]},"MP32":{"supportedServers":[
-]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}}
\ No newline at end of file
+]}},"
+descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS
+":"Health - Verify the health of your microservices with custom verifications",
+"REST_CLIENT":"Rest Client - Invoke 
+RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices",
+"JWT_AUTH":"JWT Propagation - propagate security across your mic
+roservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}}
\ No newline at end of file
diff --git a/src/test/resources/json_examples/v5/supportMatrix_servers.json.segments b/src/test/resources/json_examples/v5/supportMatrix_servers.json.segments
index 5da4b255..cd021387 100644
--- a/src/test/resources/json_examples/v5/supportMatrix_servers.json.segments
+++ b/src/test/resources/json_examples/v5/supportMatrix_servers.json.segments
@@ -3,4 +3,9 @@ TOMEE":[{
 "mpVersion":"MP12","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS"],"javaSEVersions":["SE8"]},
 {"mpVersion":"MP13","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","OPEN_API","OPEN_TRACING","REST_CLIENT"],"javaSEVersions":["SE8"]},{
 ]},{"mpVersion":"MP30","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","OPEN_API","OPEN_TRACING","REST_CLIENT"],"javaSEVersions":["SE8","SE11"]},{"mpVersion":"
-]}]},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices
\ No newline at end of file
+]}]},"descriptions":{"CONFIG":"Configuration - 
+externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your mic
+roservices with custom verifications",
+"REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner",
+FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing 
+- trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices
\ No newline at end of file
diff --git a/src/test/resources/json_examples/v6/supportMatrix.json.segments b/src/test/resources/json_examples/v6/supportMatrix.json.segments
index f83b9176..38ed6b86 100644
--- a/src/test/resources/json_examples/v6/supportMatrix.json.segments
+++ b/src/test/resources/json_examples/v6/supportMatrix.json.segments
@@ -1,4 +1,10 @@
 {"configs":{"
 MP33":{"supportedServers":["
 ]},"MP32":{"supportedServers":[
-]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}}
\ No newline at end of file
+]}},"
+descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS
+":"Health - Verify the health of your microservices with custom verifications",
+"REST_CLIENT":"Rest Client - Invoke 
+RESTful services in a type-safe manner",
+"FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your mic
+roservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}}
\ No newline at end of file
diff --git a/src/test/resources/json_examples/v7/supportMatrix.json.segments b/src/test/resources/json_examples/v7/supportMatrix.json.segments
index 97b9ea2c..71c37b9f 100644
--- a/src/test/resources/json_examples/v7/supportMatrix.json.segments
+++ b/src/test/resources/json_examples/v7/supportMatrix.json.segments
@@ -1,3 +1,9 @@
 {"configs":{"
-"MP60":{"supportedServers":["]}},
-"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","TELEMETRY":" Telemetry - pulls in Telemetry Tracing and integrate with CDI and Jakarta RESTful Web Services","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}}
\ No newline at end of file
+"MP60":{"supportedServers":["LIBERTY"],
+descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS
+":"Health - Verify the health of your microservices with custom verifications",
+"REST_CLIENT":"Rest Client - Invoke 
+RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your mic
+roservices",
+"TELEMETRY":"Telemetry - pulls in OpenTelemetry Tracing and integrate with CDI and Jakarta RESTful Web Services"
+"METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}}
\ No newline at end of file
diff --git a/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments b/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments
index 48a60b00..3b44c798 100644
--- a/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments
+++ b/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments
@@ -1 +1,2 @@
-"LIBERTY":[{"mpVersion":"MP60","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","GRAPHQL","TELEMETRY"],"javaSEVersions":["SE8","SE11"],"buildTools":["MAVEN","GRADLE"]}]
\ No newline at end of file
+"LIBERTY":[
+{"mpVersion":"MP60","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","OPEN_API","REST_CLIENT","TELEMETRY","GRAPHQL"],"javaSEVersions":["SE8","SE11"],"buildTools":["MAVEN","GRADLE"]}]
\ No newline at end of file