diff --git a/.github/workflows/reduce_readme.yml b/.github/workflows/reduce_readme.yml
index 5e43574e4e..0b2275e51f 100644
--- a/.github/workflows/reduce_readme.yml
+++ b/.github/workflows/reduce_readme.yml
@@ -39,10 +39,10 @@ jobs:
         fi
         cd $CURRENT_DIR
         done
+        #Updates the table of available quickstarts @ root README-source.adoc
+        mvn clean package -Pdocs -N
         #Reduce root README
         asciidoctor-reducer --preserve-conditionals -o README.adoc README-source.adoc
-        #Updates the table of available quickstarts @ root README.adoc
-        mvn clean package -Pdocs
     - name: Commit and Push README
       uses: EndBug/add-and-commit@v9
       with:
diff --git a/README-source.adoc b/README-source.adoc
index 4f8a681f4b..46457445e8 100644
--- a/README-source.adoc
+++ b/README-source.adoc
@@ -142,66 +142,66 @@ NOTE: Some of these quickstarts use the H2 database included with {productNameFu
 [cols="1,1,2,1,1", options="header"]
 |===
 | Quickstart Name | Demonstrated Technologies | Description | Experience Level Required | Prerequisites 
-| link:batch-processing/README{outfilesuffix}[batch-processing]| | The `batch-processing` quickstart shows how to use chunk oriented batch jobs to import a file to a database. | null | _none_
-| link:bmt/README{outfilesuffix}[bmt]| | The `bmt` quickstart demonstrates Bean-Managed Transactions (BMT), showing how to manually manage transaction demarcation while accessing JPA entities. | null | _none_
-| link:cmt/README{outfilesuffix}[cmt]| | The `cmt` quickstart demonstrates Container-Managed Transactions (CMT), showing how to use transactions managed by the container. | null | _none_
-| link:contacts-jquerymobile/README{outfilesuffix}[contacts-jquerymobile]| | The `contacts-jquerymobile` quickstart demonstrates a {javaVersion} mobile database application using HTML5, jQuery Mobile, JAX-RS, JPA, and REST. | null | _none_
-| link:ee-security/README{outfilesuffix}[ee-security]| | The `ee-security` quickstart demonstrates Jakarta EE security. | null | _none_
-| link:ejb-multi-server/README{outfilesuffix}[ejb-multi-server]| | The `ejb-multi-server` quickstart shows how to communicate between multiple applications deployed to different servers using an EJB to log the invocation. | null | _none_
-| link:ejb-remote/README{outfilesuffix}[ejb-remote]| | The `ejb-remote` quickstart uses EJB and JNDI to demonstrate how to access an EJB, deployed to {productName}, from a remote Java client application. | null | _none_
-| link:ejb-security-context-propagation/README{outfilesuffix}[ejb-security-context-propagation]| | The `ejb-security-context-propagation` quickstart demonstrates how the security context can be propagated to a remote EJB using a remote outbound connection configuration | null | _none_
-| link:ejb-security-programmatic-auth/README{outfilesuffix}[ejb-security-programmatic-auth]| | The `ejb-security-programmatic-auth` quickstart demonstrates how to programmatically setup different identities when invoking a remote secured EJB. | null | _none_
-| link:ejb-throws-exception/README{outfilesuffix}[ejb-throws-exception]| | The `ejb-throws-exception` quickstart demonstrates how to throw and handle exceptions across JARs in an EAR. | null | _none_
-| link:ejb-timer/README{outfilesuffix}[ejb-timer]| | The `ejb-timer` quickstart demonstrates how to use the Jakarta Enterprise Bean timer service `@Schedule` and `@Timeout` annotations with {productName}. | null | _none_
-| link:ejb-txn-remote-call/README{outfilesuffix}[ejb-txn-remote-call]| | The `ejb-txn-remote-call` quickstart demonstrates remote transactional EJB calls over two application servers of {productName}. | null | _none_
-| link:ha-singleton-deployment/README{outfilesuffix}[ha-singleton-deployment]| | The `ha-singleton-deployment` quickstart demonstrates the recommended way to deploy any service packaged in an application archive as a cluster-wide singleton. | null | _none_
-| link:ha-singleton-service/README{outfilesuffix}[ha-singleton-service]| | The `ha-singleton-service` quickstart demonstrates how to deploy a cluster-wide singleton JBoss MSC service. | null | _none_
-| link:helloworld/README{outfilesuffix}[helloworld]| | The `helloworld` quickstart demonstrates the use of Servlet 6 and is a good starting point to verify {productName} is configured correctly. | null | _none_
-| link:helloworld-jms/README{outfilesuffix}[helloworld-jms]| | The `helloworld-jms` quickstart demonstrates the use of external JMS clients with {productName}. | null | _none_
-| link:helloworld-mdb/README{outfilesuffix}[helloworld-mdb]| | The `helloworld-mdb` quickstart uses JMS and EJB Message-Driven Bean (MDB) to create and deploy JMS topic and queue resources in {productName}. | null | _none_
-| link:helloworld-mutual-ssl/README{outfilesuffix}[helloworld-mutual-ssl]| | The `helloworld-mutual-ssl` quickstart is a basic example that demonstrates mutual TLS configuration in {productName} | null | _none_
-| link:helloworld-mutual-ssl-secured/README{outfilesuffix}[helloworld-mutual-ssl-secured]| | The `helloworld-mutual-ssl-secured` quickstart demonstrates securing a Web application using client certificate authentication with authorization | null | _none_
-| link:helloworld-singleton/README{outfilesuffix}[helloworld-singleton]| | The `helloworld-singleton` quickstart demonstrates an EJB Singleton Bean that is instantiated once and maintains state for the life of the session. | null | _none_
-| link:helloworld-ws/README{outfilesuffix}[helloworld-ws]| | The `helloworld-ws` quickstart demonstrates a simple Hello World application, bundled and deployed as a WAR, that uses JAX-WS to say Hello. | null | _none_
-| link:hibernate/README{outfilesuffix}[hibernate]| | The `hibernate` quickstart demonstrates how to use Hibernate ORM 6 over Persistence, using Bean Validation, and Enterprise Beans. | null | _none_
-| link:http-custom-mechanism/README{outfilesuffix}[http-custom-mechanism]| | The `http-custom-mechanism` quickstart demonstrates how to implement a custom HTTP authentication mechanism that can be registered with Elytron. | null | _none_
-| link:jaxrs-client/README{outfilesuffix}[jaxrs-client]| | The `jaxrs-client` quickstart demonstrates Jakarta REST Client API, which interacts with a Jakarta REST Web service that runs on {productName}. | null | _none_
-| link:jaxrs-jwt/README{outfilesuffix}[jaxrs-jwt]| | The `jaxrs-jwt` quickstart demonstrates a Jakarta REST secured application using JSON Web Tokens (JWT) with Elytron. | null | _none_
-| link:jaxws-ejb/README{outfilesuffix}[jaxws-ejb]| | The `jaxws-ejb` quickstart is a working example of the web service endpoint created from an EJB. | null | _none_
-| link:jaxws-retail/README{outfilesuffix}[jaxws-retail]| | The `jaxws-retail` quickstart is a working example of a simple web service endpoint. | null | _none_
-| link:jsonp/README{outfilesuffix}[jsonp]| | The `jsonp` quickstart demonstrates how to use the JSON-P API to produce object-based structures and then parse and consume them as stream-based JSON strings. | null | _none_
-| link:jta-crash-rec/README{outfilesuffix}[jta-crash-rec]| | The `jta-crash-rec` quickstart uses JTA and Byteman to show how to code distributed (XA) transactions in order to preserve ACID properties on server crash. | null | _none_
-| link:jts/README{outfilesuffix}[jts]| | The `jts` quickstart shows how to use JTS to perform distributed transactions across multiple containers, fulfilling the properties of an ACID transaction. | null | _none_
-| link:kitchensink/README{outfilesuffix}[kitchensink]| | The `kitchensink` quickstart demonstrates a localized {javaVersion} web-enabled database application using JSF, CDI, EJB, JPA, and Bean Validation. | null | _none_
-| link:logging/README{outfilesuffix}[logging]| | The `logging` quickstart demonstrates how to configure different logging levels in {productName}. | null | _none_
-| link:mail/README{outfilesuffix}[mail]| | The `mail` quickstart demonstrates how to send and receive emails using CDI and JSF and with custom Mail provider configured in {productName}. | null | _none_
-| link:messaging-clustering-singleton/README{outfilesuffix}[messaging-clustering-singleton]| | The `messaging-clustering-singleton` quickstart uses a JMS topic and a queue to demonstrate clustering using {productName} messaging with MDB singleton configuration where only one node in the cluster will be active. | null | _none_
-| link:micrometer/README{outfilesuffix}[micrometer]| | The `micrometer` quickstart demonstrates the use of the Micrometer library in {productName}. | null | _none_
-| link:microprofile-config/README{outfilesuffix}[microprofile-config]| | The `microprofile-config` quickstart demonstrates the use of the MicroProfile Config specification in {productName}. | null | _none_
-| link:microprofile-fault-tolerance/README{outfilesuffix}[microprofile-fault-tolerance]| | The `microprofile-fault-tolerance` quickstart demonstrates how to use Eclipse MicroProfile Fault Tolerance in {productName}. | null | _none_
-| link:microprofile-health/README{outfilesuffix}[microprofile-health]| | The `microprofile-health` quickstart demonstrates the use of the MicroProfile Health specification in {productName}. | null | _none_
-| link:microprofile-jwt/README{outfilesuffix}[microprofile-jwt]| | The `microprofile-jwt` quickstart demonstrates the use of the MicroProfile JWT specification in {productName}. | null | _none_
-| link:microprofile-lra/README{outfilesuffix}[microprofile-lra]| | The `microprofile-lra` quickstart demonstrates the use of the MicroProfile LRA specification in {productName}. | null | _none_
-| link:microprofile-openapi/README{outfilesuffix}[microprofile-openapi]| | This guide demonstrate how to use the MicroProfile OpenAPI functionality in {productName} to expose an OpenAPI document for a simple REST application. | null | _none_
-| link:microprofile-reactive-messaging-kafka/README{outfilesuffix}[microprofile-reactive-messaging-kafka]| | The `microprofile-reactive-messaging-kafka` quickstart demonstrates the use of the MicroProfile Reactive Messaging specification backed by Apache Kafka in {productName}. | null | _none_
-| link:microprofile-rest-client/README{outfilesuffix}[microprofile-rest-client]| | The `microprofile-rest-client` quickstart demonstrates the use of the MicroProfile REST Client specification in {productName}. | null | _none_
-| link:numberguess/README{outfilesuffix}[numberguess]| | The `numberguess` quickstart demonstrates the use of CDI  (Contexts and Dependency Injection) and JSF (JavaServer Faces) in {productName}. | null | _none_
-| link:opentelemetry-tracing/README{outfilesuffix}[opentelemetry-tracing]| | The `opentelemetry-tracing` quickstart demonstrates the use of the OpenTelemetry tracing specification in {productName}. | null | _none_
-| link:remote-helloworld-mdb/README{outfilesuffix}[remote-helloworld-mdb]| | The `remote-helloworld-mdb` quickstart demonstrates the use of JMS and EJB Message-Driven Bean in {productName} with a remote broker. | null | _none_
-| link:security-domain-to-domain/README{outfilesuffix}[security-domain-to-domain]| | The `security-domain-to-domain` quickstart demonstrates the propagation of an identity across two different deployments using different security domains. | null | _none_
-| link:servlet-async/README{outfilesuffix}[servlet-async]| | The `servlet-async` quickstart demonstrates how to use asynchronous servlets to detach long-running tasks and free up the request processing thread. | null | _none_
-| link:servlet-filterlistener/README{outfilesuffix}[servlet-filterlistener]| | The `servlet-filterlistener` quickstart demonstrates how to use Servlet filters and listeners in an application. | null | _none_
-| link:servlet-security/README{outfilesuffix}[servlet-security]| | The `servlet-security` quickstart demonstrates the use of Jakarta EE declarative security to control access to Servlets and Security in {productName}. | null | _none_
-| link:spring-resteasy/README{outfilesuffix}[spring-resteasy]| | The `spring-resteasy` quickstart demonstrates how to package and deploy a web application that includes resteasy-spring integration. | null | _none_
-| link:tasks-jsf/README{outfilesuffix}[tasks-jsf]| | The `tasks-jsf` quickstart demonstrates how to use JPA persistence with JSF as the view layer. | null | _none_
-| link:temperature-converter/README{outfilesuffix}[temperature-converter]| | The `temperature-converter` quickstart does temperature conversion using an EJB Stateless Session Bean (SLSB), CDI, and a JSF front-end client. | null | _none_
-| link:thread-racing/README{outfilesuffix}[thread-racing]| | A thread racing web application that demonstrates technologies introduced or updated in the latest Jakarta EE specification. | null | _none_
-| link:todo-backend/README{outfilesuffix}[todo-backend]| | The `todo-backend` quickstart demonstrates how to implement a backend that exposes a HTTP API with JAX-RS | null | _none_
-| link:websocket-endpoint/README{outfilesuffix}[websocket-endpoint]| | Shows how to use WebSockets with JSON to broadcast information to all open WebSocket sessions in {productName}. | null | _none_
-| link:websocket-hello/README{outfilesuffix}[websocket-hello]| | The `websocket-hello` quickstart demonstrates how to create a simple WebSocket application. | null | _none_
-| link:wsat-simple/README{outfilesuffix}[wsat-simple]| | The `wsat-simple` quickstart demonstrates a WS-AT (WS-AtomicTransaction) enabled JAX-WS Web service, bundled as a WAR, and deployed to {productName}. | null | _none_
-| link:wsba-coordinator-completion-simple/README{outfilesuffix}[wsba-coordinator-completion-simple]| | The `wsba-coordinator-completion-simple` quickstart deploys a WS-BA (WS Business Activity) enabled JAX-WS Web service WAR (CoordinatorCompletion protocol). | null | _none_
-| link:wsba-participant-completion-simple/README{outfilesuffix}[wsba-participant-completion-simple]| | The `wsba-participant-completion-simple` quickstart deploys a WS-BA (WS Business Activity) enabled JAX-WS Web service WAR (ParticipantCompletion Protocol). | null | _none_
+| link:batch-processing/README{outfilesuffix}[batch-processing]|CDI, Batch 1.0, JSF | The `batch-processing` quickstart shows how to use chunk oriented batch jobs to import a file to a database. | Intermediate | _none_
+| link:bmt/README{outfilesuffix}[bmt]|EJB, BMT | The `bmt` quickstart demonstrates Bean-Managed Transactions (BMT), showing how to manually manage transaction demarcation while accessing JPA entities. | Intermediate | _none_
+| link:cmt/README{outfilesuffix}[cmt]|EJB, CMT, JMS | The `cmt` quickstart demonstrates Container-Managed Transactions (CMT), showing how to use transactions managed by the container. | Intermediate | _none_
+| link:contacts-jquerymobile/README{outfilesuffix}[contacts-jquerymobile]|jQuery Mobile, jQuery, JavaScript, HTML5, REST | The `contacts-jquerymobile` quickstart demonstrates a {javaVersion} mobile database application using HTML5, jQuery Mobile, JAX-RS, JPA, and REST. | Beginner | _none_
+| link:ee-security/README{outfilesuffix}[ee-security]|EE Security, Servlet, CDI | The `ee-security` quickstart demonstrates Jakarta EE security. | Intermediate | _none_
+| link:ejb-multi-server/README{outfilesuffix}[ejb-multi-server]|EJB, EAR | The `ejb-multi-server` quickstart shows how to communicate between multiple applications deployed to different servers using an EJB to log the invocation. | Advanced | _none_
+| link:ejb-remote/README{outfilesuffix}[ejb-remote]|EJB, JNDI | The `ejb-remote` quickstart uses EJB and JNDI to demonstrate how to access an EJB, deployed to {productName}, from a remote Java client application. | Intermediate | _none_
+| link:ejb-security-context-propagation/README{outfilesuffix}[ejb-security-context-propagation]|EJB, Security | The `ejb-security-context-propagation` quickstart demonstrates how the security context can be propagated to a remote EJB using a remote outbound connection configuration | Advanced | _none_
+| link:ejb-security-programmatic-auth/README{outfilesuffix}[ejb-security-programmatic-auth]|EJB, Security | The `ejb-security-programmatic-auth` quickstart demonstrates how to programmatically setup different identities when invoking a remote secured EJB. | Intermediate | _none_
+| link:ejb-throws-exception/README{outfilesuffix}[ejb-throws-exception]|EJB, EAR | The `ejb-throws-exception` quickstart demonstrates how to throw and handle exceptions across JARs in an EAR. | Intermediate | _none_
+| link:ejb-timer/README{outfilesuffix}[ejb-timer]|EJB Timer | The `ejb-timer` quickstart demonstrates how to use the Jakarta Enterprise Bean timer service `@Schedule` and `@Timeout` annotations with {productName}. | Beginner | _none_
+| link:ejb-txn-remote-call/README{outfilesuffix}[ejb-txn-remote-call]|EJB, JTA, Clustering | The `ejb-txn-remote-call` quickstart demonstrates remote transactional EJB calls over two application servers of {productName}. | Intermediate | _none_
+| link:ha-singleton-deployment/README{outfilesuffix}[ha-singleton-deployment]|EJB, Singleton Deployments, Clustering | The `ha-singleton-deployment` quickstart demonstrates the recommended way to deploy any service packaged in an application archive as a cluster-wide singleton. | Advanced | _none_
+| link:ha-singleton-service/README{outfilesuffix}[ha-singleton-service]|JBoss MSC, Singleton Service, Clustering | The `ha-singleton-service` quickstart demonstrates how to deploy a cluster-wide singleton JBoss MSC service. | Advanced | _none_
+| link:helloworld/README{outfilesuffix}[helloworld]|Servlet | The `helloworld` quickstart demonstrates the use of Servlet 6 and is a good starting point to verify {productName} is configured correctly. | Beginner | _none_
+| link:helloworld-jms/README{outfilesuffix}[helloworld-jms]|JMS | The `helloworld-jms` quickstart demonstrates the use of external JMS clients with {productName}. | Intermediate | _none_
+| link:helloworld-mdb/README{outfilesuffix}[helloworld-mdb]|JMS, EJB, MDB | The `helloworld-mdb` quickstart uses JMS and EJB Message-Driven Bean (MDB) to create and deploy JMS topic and queue resources in {productName}. | Intermediate | _none_
+| link:helloworld-mutual-ssl/README{outfilesuffix}[helloworld-mutual-ssl]|Mutual TLS, Undertow | The `helloworld-mutual-ssl` quickstart is a basic example that demonstrates mutual TLS configuration in {productName} | Intermediate | _none_
+| link:helloworld-mutual-ssl-secured/README{outfilesuffix}[helloworld-mutual-ssl-secured]|Mutual TLS, Security, Undertow | The `helloworld-mutual-ssl-secured` quickstart demonstrates securing a Web application using client certificate authentication with authorization | Intermediate | _none_
+| link:helloworld-singleton/README{outfilesuffix}[helloworld-singleton]|EJB, Singleton | The `helloworld-singleton` quickstart demonstrates an EJB Singleton Bean that is instantiated once and maintains state for the life of the session. | Beginner | _none_
+| link:helloworld-ws/README{outfilesuffix}[helloworld-ws]|JAX-WS | The `helloworld-ws` quickstart demonstrates a simple Hello World application, bundled and deployed as a WAR, that uses JAX-WS to say Hello. | Beginner | _none_
+| link:hibernate/README{outfilesuffix}[hibernate]|Hibernate | The `hibernate` quickstart demonstrates how to use Hibernate ORM 6 over Persistence, using Bean Validation, and Enterprise Beans. | Intermediate | _none_
+| link:http-custom-mechanism/README{outfilesuffix}[http-custom-mechanism]|EJB, Security | The `http-custom-mechanism` quickstart demonstrates how to implement a custom HTTP authentication mechanism that can be registered with Elytron. | Intermediate | _none_
+| link:jaxrs-client/README{outfilesuffix}[jaxrs-client]|JAX-RS | The `jaxrs-client` quickstart demonstrates Jakarta REST Client API, which interacts with a Jakarta REST Web service that runs on {productName}. | Beginner | _none_
+| link:jaxrs-jwt/README{outfilesuffix}[jaxrs-jwt]|JAX-RS, Security | The `jaxrs-jwt` quickstart demonstrates a Jakarta REST secured application using JSON Web Tokens (JWT) with Elytron. | Intermediate | _none_
+| link:jaxws-ejb/README{outfilesuffix}[jaxws-ejb]|JAX-WS | The `jaxws-ejb` quickstart is a working example of the web service endpoint created from an EJB. | Beginner | _none_
+| link:jaxws-retail/README{outfilesuffix}[jaxws-retail]|JAX-WS | The `jaxws-retail` quickstart is a working example of a simple web service endpoint. | Beginner | _none_
+| link:jsonp/README{outfilesuffix}[jsonp]|CDI, JSF, JSON-P | The `jsonp` quickstart demonstrates how to use the JSON-P API to produce object-based structures and then parse and consume them as stream-based JSON strings. | Beginner | _none_
+| link:jta-crash-rec/README{outfilesuffix}[jta-crash-rec]|JTA, Crash Recovery | The `jta-crash-rec` quickstart uses JTA and Byteman to show how to code distributed (XA) transactions in order to preserve ACID properties on server crash. | Advanced | _none_
+| link:jts/README{outfilesuffix}[jts]|JTS, EJB, JMS | The `jts` quickstart shows how to use JTS to perform distributed transactions across multiple containers, fulfilling the properties of an ACID transaction. | Intermediate | link:cmt/README.html[cmt]
+| link:kitchensink/README{outfilesuffix}[kitchensink]|CDI, JSF, JPA, EJB, JAX-RS, BV | The `kitchensink` quickstart demonstrates a localized {javaVersion} web-enabled database application using JSF, CDI, EJB, JPA, and Bean Validation. | Intermediate | _none_
+| link:logging/README{outfilesuffix}[logging]|Logging | The `logging` quickstart demonstrates how to configure different logging levels in {productName}. | Intermediate | _none_
+| link:mail/README{outfilesuffix}[mail]|JavaMail, CDI, JSF | The `mail` quickstart demonstrates how to send and receive emails using CDI and JSF and with custom Mail provider configured in {productName}. | Beginner | _none_
+| link:messaging-clustering-singleton/README{outfilesuffix}[messaging-clustering-singleton]|JMS, MDB, Clustering | The `messaging-clustering-singleton` quickstart uses a JMS topic and a queue to demonstrate clustering using {productName} messaging with MDB singleton configuration where only one node in the cluster will be active. | Advanced | _none_
+| link:micrometer/README{outfilesuffix}[micrometer]|Micrometer | The `micrometer` quickstart demonstrates the use of the Micrometer library in {productName}. | Beginner | _none_
+| link:microprofile-config/README{outfilesuffix}[microprofile-config]|MicroProfile Config | The `microprofile-config` quickstart demonstrates the use of the MicroProfile Config specification in {productName}. | Beginner | _none_
+| link:microprofile-fault-tolerance/README{outfilesuffix}[microprofile-fault-tolerance]|MicroProfile, Fault Tolerance | The `microprofile-fault-tolerance` quickstart demonstrates how to use Eclipse MicroProfile Fault Tolerance in {productName}. | Intermediate | _none_
+| link:microprofile-health/README{outfilesuffix}[microprofile-health]|MicroProfile Health | The `microprofile-health` quickstart demonstrates the use of the MicroProfile Health specification in {productName}. | Beginner | _none_
+| link:microprofile-jwt/README{outfilesuffix}[microprofile-jwt]|JWT, Security, MicroProfile | The `microprofile-jwt` quickstart demonstrates the use of the MicroProfile JWT specification in {productName}. | Intermediate | _none_
+| link:microprofile-lra/README{outfilesuffix}[microprofile-lra]|MicroProfile LRA | The `microprofile-lra` quickstart demonstrates the use of the MicroProfile LRA specification in {productName}. | Beginner | _none_
+| link:microprofile-openapi/README{outfilesuffix}[microprofile-openapi]|MicroProfile OpenAPI | This guide demonstrate how to use the MicroProfile OpenAPI functionality in {productName} to expose an OpenAPI document for a simple REST application. | Beginner | _none_
+| link:microprofile-reactive-messaging-kafka/README{outfilesuffix}[microprofile-reactive-messaging-kafka]|MicroProfile Reactive Messaging | The `microprofile-reactive-messaging-kafka` quickstart demonstrates the use of the MicroProfile Reactive Messaging specification backed by Apache Kafka in {productName}. | Beginner | _none_
+| link:microprofile-rest-client/README{outfilesuffix}[microprofile-rest-client]|MicroProfile REST Client | The `microprofile-rest-client` quickstart demonstrates the use of the MicroProfile REST Client specification in {productName}. | Beginner | _none_
+| link:numberguess/README{outfilesuffix}[numberguess]|CDI, JSF | The `numberguess` quickstart demonstrates the use of CDI  (Contexts and Dependency Injection) and JSF (JavaServer Faces) in {productName}. | Beginner | _none_
+| link:opentelemetry-tracing/README{outfilesuffix}[opentelemetry-tracing]|OpenTelemetry Tracing | The `opentelemetry-tracing` quickstart demonstrates the use of the OpenTelemetry tracing specification in {productName}. | Beginner | _none_
+| link:remote-helloworld-mdb/README{outfilesuffix}[remote-helloworld-mdb]|JMS, EJB, MDB | The `remote-helloworld-mdb` quickstart demonstrates the use of JMS and EJB Message-Driven Bean in {productName} with a remote broker. | Intermediate | _none_
+| link:security-domain-to-domain/README{outfilesuffix}[security-domain-to-domain]|Servlet, EJB, Security | The `security-domain-to-domain` quickstart demonstrates the propagation of an identity across two different deployments using different security domains. | Advanced | _none_
+| link:servlet-async/README{outfilesuffix}[servlet-async]|Asynchronous Servlet, CDI, EJB | The `servlet-async` quickstart demonstrates how to use asynchronous servlets to detach long-running tasks and free up the request processing thread. | Intermediate | _none_
+| link:servlet-filterlistener/README{outfilesuffix}[servlet-filterlistener]|Servlet Filter, Servlet Listener | The `servlet-filterlistener` quickstart demonstrates how to use Servlet filters and listeners in an application. | Intermediate | _none_
+| link:servlet-security/README{outfilesuffix}[servlet-security]|Servlet, Security | The `servlet-security` quickstart demonstrates the use of Jakarta EE declarative security to control access to Servlets and Security in {productName}. | Intermediate | _none_
+| link:spring-resteasy/README{outfilesuffix}[spring-resteasy]|Resteasy, Spring | The `spring-resteasy` quickstart demonstrates how to package and deploy a web application that includes resteasy-spring integration. | Beginner | _none_
+| link:tasks-jsf/README{outfilesuffix}[tasks-jsf]|JSF, JPA | The `tasks-jsf` quickstart demonstrates how to use JPA persistence with JSF as the view layer. | Intermediate | _none_
+| link:temperature-converter/README{outfilesuffix}[temperature-converter]|CDI, JSF, SLSB EJB | The `temperature-converter` quickstart does temperature conversion using an EJB Stateless Session Bean (SLSB), CDI, and a JSF front-end client. | Beginner | _none_
+| link:thread-racing/README{outfilesuffix}[thread-racing]|Batch, CDI, EE Concurrency, JAX-RS, JMS, JPA, JSON, Web Sockets | A thread racing web application that demonstrates technologies introduced or updated in the latest Jakarta EE specification. | Beginner | _none_
+| link:todo-backend/README{outfilesuffix}[todo-backend]|JPA, JAX-RS, OpenShift, Galleon | The `todo-backend` quickstart demonstrates how to implement a backend that exposes a HTTP API with JAX-RS | Intermediate | _none_
+| link:websocket-endpoint/README{outfilesuffix}[websocket-endpoint]|CDI, WebSocket, JSON-P | Shows how to use WebSockets with JSON to broadcast information to all open WebSocket sessions in {productName}. | Beginner | _none_
+| link:websocket-hello/README{outfilesuffix}[websocket-hello]|WebSocket, CDI, JSF | The `websocket-hello` quickstart demonstrates how to create a simple WebSocket application. | Beginner | _none_
+| link:wsat-simple/README{outfilesuffix}[wsat-simple]|WS-AT, JAX-WS | The `wsat-simple` quickstart demonstrates a WS-AT (WS-AtomicTransaction) enabled JAX-WS Web service, bundled as a WAR, and deployed to {productName}. | Intermediate | _none_
+| link:wsba-coordinator-completion-simple/README{outfilesuffix}[wsba-coordinator-completion-simple]|WS-BA, JAX-WS | The `wsba-coordinator-completion-simple` quickstart deploys a WS-BA (WS Business Activity) enabled JAX-WS Web service WAR (CoordinatorCompletion protocol). | Intermediate | _none_
+| link:wsba-participant-completion-simple/README{outfilesuffix}[wsba-participant-completion-simple]|WS-BA, JAX-WS | The `wsba-participant-completion-simple` quickstart deploys a WS-BA (WS Business Activity) enabled JAX-WS Web service WAR (ParticipantCompletion Protocol). | Intermediate | _none_
 |===
 //</TOC>
 
diff --git a/README.adoc b/README.adoc
index d5c1d6d986..cb04716c57 100644
--- a/README.adoc
+++ b/README.adoc
@@ -374,7 +374,7 @@ NOTE: Some of these quickstarts use the H2 database included with {productNameFu
 | link:microprofile-fault-tolerance/README{outfilesuffix}[microprofile-fault-tolerance]| | The `microprofile-fault-tolerance` quickstart demonstrates how to use Eclipse MicroProfile Fault Tolerance in {productName}. | null | _none_
 | link:microprofile-health/README{outfilesuffix}[microprofile-health]| | The `microprofile-health` quickstart demonstrates the use of the MicroProfile Health specification in {productName}. | null | _none_
 | link:microprofile-jwt/README{outfilesuffix}[microprofile-jwt]| | The `microprofile-jwt` quickstart demonstrates the use of the MicroProfile JWT specification in {productName}. | null | _none_
-| link:microprofile-lra/README{outfilesuffix}[microprofile-lra]| | The `microprofile-lra` quickstart demonstrates the use of the MicroProfile LRA specification in {productName}. | null | _none_
+| link:microprofile-lra/README{outfilesuffix}[microprofile-lra]|MicroProfile LRA | The `microprofile-lra` quickstart demonstrates the use of the MicroProfile LRA specification in {productName}. | Beginner | _none_
 | link:microprofile-openapi/README{outfilesuffix}[microprofile-openapi]| | This guide demonstrate how to use the MicroProfile OpenAPI functionality in {productName} to expose an OpenAPI document for a simple REST application. | null | _none_
 | link:microprofile-reactive-messaging-kafka/README{outfilesuffix}[microprofile-reactive-messaging-kafka]| | The `microprofile-reactive-messaging-kafka` quickstart demonstrates the use of the MicroProfile Reactive Messaging specification backed by Apache Kafka in {productName}. | null | _none_
 | link:microprofile-rest-client/README{outfilesuffix}[microprofile-rest-client]| | The `microprofile-rest-client` quickstart demonstrates the use of the MicroProfile REST Client specification in {productName}. | null | _none_
diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml
index d5cf5067bf..90109fb155 100644
--- a/batch-processing/pom.xml
+++ b/batch-processing/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/bmt/pom.xml b/bmt/pom.xml
index 7688bf5eef..2b30c6fa32 100644
--- a/bmt/pom.xml
+++ b/bmt/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/cmt/pom.xml b/cmt/pom.xml
index 94996db3f7..2b455e5dcd 100644
--- a/cmt/pom.xml
+++ b/cmt/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>cmt</artifactId>
@@ -44,7 +44,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/contacts-jquerymobile/functional-tests/pom.xml b/contacts-jquerymobile/functional-tests/pom.xml
index 866cf5e301..8ced30424b 100644
--- a/contacts-jquerymobile/functional-tests/pom.xml
+++ b/contacts-jquerymobile/functional-tests/pom.xml
@@ -24,7 +24,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>contacts-jquerymobile-test-webdriver</artifactId>
diff --git a/contacts-jquerymobile/pom.xml b/contacts-jquerymobile/pom.xml
index 8c8e56d787..aefe2b4cd9 100644
--- a/contacts-jquerymobile/pom.xml
+++ b/contacts-jquerymobile/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>contacts-jquerymobile</artifactId>
diff --git a/ee-security/pom.xml b/ee-security/pom.xml
index 0dee4ac0ab..c1193441a4 100644
--- a/ee-security/pom.xml
+++ b/ee-security/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- Version for the server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/ejb-multi-server/app-main/ear/pom.xml b/ejb-multi-server/app-main/ear/pom.xml
index 83d161a7ab..cf58e79183 100644
--- a/ejb-multi-server/app-main/ear/pom.xml
+++ b/ejb-multi-server/app-main/ear/pom.xml
@@ -75,7 +75,7 @@
                     <displayName>Application Main</displayName>
                     <description>A simple quickstart application to demonstrate the
                         server-server communication</description>
-                    <version>7</version>
+                    <version>8</version>
                     <generateApplicationXml>true</generateApplicationXml>
                     <!-- must start in order to ensure that the reference to MainApp is found in the JsfController -->
                     <initializeInOrder>true</initializeInOrder>
diff --git a/ejb-multi-server/app-one/ear/pom.xml b/ejb-multi-server/app-one/ear/pom.xml
index f61f54ec53..98f50d9d6d 100644
--- a/ejb-multi-server/app-one/ear/pom.xml
+++ b/ejb-multi-server/app-one/ear/pom.xml
@@ -54,7 +54,7 @@
                     <displayName>Application One</displayName>
                     <description>A simple quickstart application to demonstrate the
                         server-server communication</description>
-                    <version>7</version>
+                    <version>8</version>
                     <!-- it work also without a application.xml but this is to demonstrate
             how to use it and activate the jarModule in it -->
                     <generateApplicationXml>true</generateApplicationXml>
diff --git a/ejb-multi-server/app-two/ear/pom.xml b/ejb-multi-server/app-two/ear/pom.xml
index 1ae905e226..88d0a55e27 100644
--- a/ejb-multi-server/app-two/ear/pom.xml
+++ b/ejb-multi-server/app-two/ear/pom.xml
@@ -55,7 +55,7 @@
                     <displayName>Application Two</displayName>
                     <description>A simple quickstart application to demonstrate the
                         server-server communication</description>
-                    <version>7</version>
+                    <version>8</version>
                     <!-- it work also without a application.xml but this is to demonstrate
             how to use it and activate the jarModule in it -->
                     <generateApplicationXml>true</generateApplicationXml>
diff --git a/ejb-multi-server/pom.xml b/ejb-multi-server/pom.xml
index 7b5c7e9b20..2938fe95fe 100644
--- a/ejb-multi-server/pom.xml
+++ b/ejb-multi-server/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>ejb-multi-server</artifactId>
@@ -47,7 +47,7 @@
 
     <properties>
         <!-- The versions for BOMs, Dependencies and Plugins -->
-        <version.server.bom>31.0.0.Beta1</version.server.bom>
+        <version.server.bom>31.0.0.Final</version.server.bom>
     </properties>
 
     <repositories>
diff --git a/ejb-remote/pom.xml b/ejb-remote/pom.xml
index e75786bee7..53aa926831 100644
--- a/ejb-remote/pom.xml
+++ b/ejb-remote/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>ejb-remote</artifactId>
@@ -44,7 +44,7 @@
 
     <properties>
         <!-- Version for the server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/ejb-security-context-propagation/pom.xml b/ejb-security-context-propagation/pom.xml
index ca94d0833c..2baf623254 100644
--- a/ejb-security-context-propagation/pom.xml
+++ b/ejb-security-context-propagation/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>ejb-security-context-propagation</artifactId>
@@ -44,7 +44,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Dependencies and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/ejb-security-programmatic-auth/pom.xml b/ejb-security-programmatic-auth/pom.xml
index 9a73663d73..8bcb362e3d 100644
--- a/ejb-security-programmatic-auth/pom.xml
+++ b/ejb-security-programmatic-auth/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>ejb-security-programmatic-auth</artifactId>
@@ -44,7 +44,7 @@
 
     <properties>
       <!-- the version for the Server -->
-      <version.server>31.0.0.Beta1</version.server>
+      <version.server>31.0.0.Final</version.server>
       <!-- The versions for BOMs, Packs and Plugins -->
       <version.bom.ee>${version.server}</version.bom.ee>
       <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/ejb-throws-exception/ear/pom.xml b/ejb-throws-exception/ear/pom.xml
index dafa574a01..4df705d088 100644
--- a/ejb-throws-exception/ear/pom.xml
+++ b/ejb-throws-exception/ear/pom.xml
@@ -63,7 +63,7 @@
                 <artifactId>maven-ear-plugin</artifactId>
                 <configuration>
                     <!-- Tell Maven we are using Jakarta EE -->
-                    <version>7</version>
+                    <version>8</version>
                     <!-- Use Jakarta EE ear libraries as needed. Jakarta EE ear
                         libraries are in easy way to package any libraries needed in the ear, and
                         automatically have any modules (EJB-JARs and WARs) use them -->
diff --git a/ejb-throws-exception/pom.xml b/ejb-throws-exception/pom.xml
index 22d8cff9c8..ec43f8a814 100644
--- a/ejb-throws-exception/pom.xml
+++ b/ejb-throws-exception/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>ejb-throws-exception</artifactId>
@@ -51,7 +51,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Dependencies and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/ejb-timer/pom.xml b/ejb-timer/pom.xml
index dcf411dd11..001c086c5b 100644
--- a/ejb-timer/pom.xml
+++ b/ejb-timer/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>ejb-timer</artifactId>
@@ -44,7 +44,7 @@
 
     <properties>
         <!-- The versions for BOMs, Dependencies and Plugins -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
         <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
diff --git a/ejb-txn-remote-call/client/pom.xml b/ejb-txn-remote-call/client/pom.xml
index 5767f4a60a..650d2ae824 100644
--- a/ejb-txn-remote-call/client/pom.xml
+++ b/ejb-txn-remote-call/client/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -37,7 +37,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>30.0.0.Final</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>4.2.0.Final</version.plugin.wildfly>
diff --git a/ejb-txn-remote-call/pom.xml b/ejb-txn-remote-call/pom.xml
index 7ba2fe5eae..260965fe13 100644
--- a/ejb-txn-remote-call/pom.xml
+++ b/ejb-txn-remote-call/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
diff --git a/ejb-txn-remote-call/server/pom.xml b/ejb-txn-remote-call/server/pom.xml
index c13a51b396..ddc4da0dcb 100644
--- a/ejb-txn-remote-call/server/pom.xml
+++ b/ejb-txn-remote-call/server/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -37,7 +37,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>30.0.0.Final</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.narayana>7.0.0.Final</version.narayana>
diff --git a/ha-singleton-deployment/pom.xml b/ha-singleton-deployment/pom.xml
index e0ffac0515..9802d19bfd 100644
--- a/ha-singleton-deployment/pom.xml
+++ b/ha-singleton-deployment/pom.xml
@@ -31,7 +31,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
diff --git a/ha-singleton-service/pom.xml b/ha-singleton-service/pom.xml
index 92232c7371..4b2e850dd8 100644
--- a/ha-singleton-service/pom.xml
+++ b/ha-singleton-service/pom.xml
@@ -26,7 +26,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml
index 2f19b5687f..4c227738a1 100644
--- a/helloworld-jms/pom.xml
+++ b/helloworld-jms/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>helloworld-jms</artifactId>
@@ -44,7 +44,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/helloworld-mdb/pom.xml b/helloworld-mdb/pom.xml
index a2dd4d344e..d441c6fc29 100644
--- a/helloworld-mdb/pom.xml
+++ b/helloworld-mdb/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>      
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/helloworld-mutual-ssl-secured/pom.xml b/helloworld-mutual-ssl-secured/pom.xml
index a4080ff4c4..167ed24fc7 100644
--- a/helloworld-mutual-ssl-secured/pom.xml
+++ b/helloworld-mutual-ssl-secured/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
diff --git a/helloworld-mutual-ssl/pom.xml b/helloworld-mutual-ssl/pom.xml
index 0740336e46..c62b81dfa0 100644
--- a/helloworld-mutual-ssl/pom.xml
+++ b/helloworld-mutual-ssl/pom.xml
@@ -26,7 +26,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>helloworld-mutual-ssl</artifactId>
diff --git a/helloworld-singleton/pom.xml b/helloworld-singleton/pom.xml
index 6205344417..16c0d64c98 100644
--- a/helloworld-singleton/pom.xml
+++ b/helloworld-singleton/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/helloworld-ws/pom.xml b/helloworld-ws/pom.xml
index 0a1a132e64..f88d0bcd14 100644
--- a/helloworld-ws/pom.xml
+++ b/helloworld-ws/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>helloworld-ws</artifactId>
@@ -44,7 +44,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index e223083470..7739c368a2 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>helloworld</artifactId>
@@ -44,7 +44,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/hibernate/pom.xml b/hibernate/pom.xml
index 1521e8eba4..6349ed34a4 100644
--- a/hibernate/pom.xml
+++ b/hibernate/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/http-custom-mechanism/pom.xml b/http-custom-mechanism/pom.xml
index 46f5a34554..9fbf9f0c73 100644
--- a/http-custom-mechanism/pom.xml
+++ b/http-custom-mechanism/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -50,7 +50,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml
index b515fa2465..fdded2eb4d 100644
--- a/jaxrs-client/pom.xml
+++ b/jaxrs-client/pom.xml
@@ -26,7 +26,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>jaxrs-client</artifactId>
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- The server version -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Dependencies and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/jaxrs-jwt/pom.xml b/jaxrs-jwt/pom.xml
index da3c371537..8df413c838 100644
--- a/jaxrs-jwt/pom.xml
+++ b/jaxrs-jwt/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>jaxrs-jwt</artifactId>
@@ -44,7 +44,7 @@
 
     <properties>
         <!-- The server version -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Dependencies and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/jaxws-ejb/pom.xml b/jaxws-ejb/pom.xml
index 5764ae2692..09d2c08f53 100644
--- a/jaxws-ejb/pom.xml
+++ b/jaxws-ejb/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>jaxws-ejb</artifactId>
@@ -44,7 +44,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/jaxws-retail/pom.xml b/jaxws-retail/pom.xml
index f9235430c7..e219b48af7 100644
--- a/jaxws-retail/pom.xml
+++ b/jaxws-retail/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>jaxws-retail</artifactId>
@@ -43,7 +43,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/jsonp/pom.xml b/jsonp/pom.xml
index 82a8516c43..6eaa721011 100644
--- a/jsonp/pom.xml
+++ b/jsonp/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>jsonp</artifactId>
@@ -44,7 +44,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/jta-crash-rec/pom.xml b/jta-crash-rec/pom.xml
index f026e74d9d..360bdd5e93 100644
--- a/jta-crash-rec/pom.xml
+++ b/jta-crash-rec/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>jta-crash-rec</artifactId>
@@ -44,7 +44,7 @@
 
     <properties>
         <!-- The compatible WildFly version -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
     </properties>
diff --git a/jts/pom.xml b/jts/pom.xml
index 7c3bcbe580..1af448acb7 100644
--- a/jts/pom.xml
+++ b/jts/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <!-- TODO fix artifact name to match components -->
@@ -52,7 +52,7 @@
 
     <properties>
         <!-- The versions for BOMs, Dependencies and Plugins -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
     </properties>
diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml
index 41d92486ad..a4900c70f8 100644
--- a/kitchensink/pom.xml
+++ b/kitchensink/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>kitchensink</artifactId>
@@ -44,7 +44,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/logging/pom.xml b/logging/pom.xml
index d8494edf53..9ff4c8cf5d 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>jboss-logging</artifactId>
@@ -44,7 +44,7 @@
 
     <properties>
         <!-- The server version -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Dependencies and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/mail/pom.xml b/mail/pom.xml
index 415e709873..084a8ac851 100644
--- a/mail/pom.xml
+++ b/mail/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/messaging-clustering-singleton/pom.xml b/messaging-clustering-singleton/pom.xml
index a44a993cfa..d7b5bf905a 100644
--- a/messaging-clustering-singleton/pom.xml
+++ b/messaging-clustering-singleton/pom.xml
@@ -24,7 +24,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
diff --git a/micrometer/pom.xml b/micrometer/pom.xml
index c33bfe679e..7064c9dcbe 100644
--- a/micrometer/pom.xml
+++ b/micrometer/pom.xml
@@ -10,7 +10,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -22,7 +22,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
diff --git a/microprofile-config/pom.xml b/microprofile-config/pom.xml
index 5b53ca1c43..b35038a5f6 100644
--- a/microprofile-config/pom.xml
+++ b/microprofile-config/pom.xml
@@ -8,7 +8,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -20,7 +20,7 @@
 
   <properties>
       <!-- the version for the Server -->
-      <version.server>31.0.0.Beta1</version.server>
+      <version.server>31.0.0.Final</version.server>
       <!-- The versions for the BOMs, Packs and Plugins -->
       <version.bom.ee>${version.server}</version.bom.ee>
       <version.bom.microprofile>${version.server}</version.bom.microprofile>
diff --git a/microprofile-fault-tolerance/pom.xml b/microprofile-fault-tolerance/pom.xml
index 1a50015b62..8fad4452a1 100644
--- a/microprofile-fault-tolerance/pom.xml
+++ b/microprofile-fault-tolerance/pom.xml
@@ -26,7 +26,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>microprofile-fault-tolerance</artifactId>
@@ -53,7 +53,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.microprofile>${version.server}</version.bom.microprofile>
diff --git a/microprofile-health/pom.xml b/microprofile-health/pom.xml
index b58c2ce1ce..f8dd1c12fe 100644
--- a/microprofile-health/pom.xml
+++ b/microprofile-health/pom.xml
@@ -8,7 +8,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -19,7 +19,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.microprofile>${version.server}</version.bom.microprofile>
diff --git a/microprofile-jwt/pom.xml b/microprofile-jwt/pom.xml
index f310169b77..363cde925e 100644
--- a/microprofile-jwt/pom.xml
+++ b/microprofile-jwt/pom.xml
@@ -24,7 +24,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -44,7 +44,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.microprofile>${version.server}</version.bom.microprofile>
diff --git a/microprofile-lra/pom.xml b/microprofile-lra/pom.xml
index 3988283657..f00e3a55d2 100644
--- a/microprofile-lra/pom.xml
+++ b/microprofile-lra/pom.xml
@@ -8,7 +8,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -19,7 +19,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.microprofile>${version.server}</version.bom.microprofile>
diff --git a/microprofile-openapi/pom.xml b/microprofile-openapi/pom.xml
index 8fdca362d6..b267270c07 100644
--- a/microprofile-openapi/pom.xml
+++ b/microprofile-openapi/pom.xml
@@ -9,7 +9,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -21,7 +21,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.microprofile>${version.server}</version.bom.microprofile>
diff --git a/microprofile-reactive-messaging-kafka/pom.xml b/microprofile-reactive-messaging-kafka/pom.xml
index f787f01475..e57216b117 100644
--- a/microprofile-reactive-messaging-kafka/pom.xml
+++ b/microprofile-reactive-messaging-kafka/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>microprofile-reactive-messaging-kafka</artifactId>
@@ -36,7 +36,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.microprofile>${version.server}</version.bom.microprofile>
diff --git a/microprofile-rest-client/pom.xml b/microprofile-rest-client/pom.xml
index bcb4aaa8d1..1259e3d350 100644
--- a/microprofile-rest-client/pom.xml
+++ b/microprofile-rest-client/pom.xml
@@ -24,7 +24,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>microprofile-rest-client</artifactId>
@@ -42,7 +42,7 @@
 
     <properties>
         <!-- The server version -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Dependencies and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.microprofile>${version.server}</version.bom.microprofile>
diff --git a/numberguess/pom.xml b/numberguess/pom.xml
index 9087004e3a..55f0fb35c5 100644
--- a/numberguess/pom.xml
+++ b/numberguess/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
     <artifactId>numberguess</artifactId>
@@ -44,7 +44,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/opentelemetry-tracing/pom.xml b/opentelemetry-tracing/pom.xml
index ea508f9746..61abfd195e 100644
--- a/opentelemetry-tracing/pom.xml
+++ b/opentelemetry-tracing/pom.xml
@@ -8,7 +8,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -20,7 +20,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
diff --git a/pom.xml b/pom.xml
index 5201fe1e7e..e25502dba1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
         <version.org.asciidoctor.asciidoctor-maven-plugin>2.1.0</version.org.asciidoctor.asciidoctor-maven-plugin>
         <version.wildfly.maven.plugin>4.2.0.Final</version.wildfly.maven.plugin>
         <version.org.wildfly.checkstyle-config>1.0.7.Final</version.org.wildfly.checkstyle-config>
-        <version.org.wildfly.quickstarts.documentation.plugin>2.3.0.Final</version.org.wildfly.quickstarts.documentation.plugin>
+        <version.org.wildfly.quickstarts.documentation.plugin>2.4.0.Final</version.org.wildfly.quickstarts.documentation.plugin>
         <!-- other plug-in versions -->
         <version.com.mycyla.license>3.0</version.com.mycyla.license>
         <version.checkstyle>8.5</version.checkstyle>
@@ -447,7 +447,9 @@
                         <inherited>false</inherited>
                         <configuration>
                             <rootDirectory>.</rootDirectory>
-                            <targetDocument>README.adoc</targetDocument>
+                            <includeOpenshift/>
+                            <sourceDocument>README-source.adoc</sourceDocument>
+                            <targetDocument>README-source.adoc</targetDocument>
                         </configuration>
                         <executions>
                             <execution>
@@ -477,7 +479,7 @@
                             </resources>
                             <doctype>article</doctype>
                             <sourceDirectory>.</sourceDirectory>
-                            <sourceDocumentName>README.adoc</sourceDocumentName>
+                            <sourceDocumentName>README-source.adoc</sourceDocumentName>
                             <outputFile>README.html</outputFile>
                             <outputDirectory>.</outputDirectory>
                         </configuration>
diff --git a/remote-helloworld-mdb/pom.xml b/remote-helloworld-mdb/pom.xml
index 8f12bd9811..df7baf3a94 100644
--- a/remote-helloworld-mdb/pom.xml
+++ b/remote-helloworld-mdb/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>      
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/security-domain-to-domain/ear/pom.xml b/security-domain-to-domain/ear/pom.xml
index 07fc17d52a..65d8bf62b7 100644
--- a/security-domain-to-domain/ear/pom.xml
+++ b/security-domain-to-domain/ear/pom.xml
@@ -65,7 +65,7 @@
                 <!-- configuring the EAR plug-in -->
                 <configuration>
                     <!-- Tell Maven we are using Jakarta EE -->
-                    <version>7</version>
+                    <version>8</version>
                     <!-- Use Jakarta EE ear libraries as needed. Jakarta EE ear libraries
                         are in easy way to package any libraries needed in the ear, and automatically
                         have any modules (EJB-JARs and WARs) use them -->
diff --git a/security-domain-to-domain/pom.xml b/security-domain-to-domain/pom.xml
index 8b57d8319c..b0ab437f08 100644
--- a/security-domain-to-domain/pom.xml
+++ b/security-domain-to-domain/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
diff --git a/servlet-async/pom.xml b/servlet-async/pom.xml
index 299e82c237..d99ccd2523 100644
--- a/servlet-async/pom.xml
+++ b/servlet-async/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/servlet-filterlistener/pom.xml b/servlet-filterlistener/pom.xml
index 35df782c54..9fa5395a12 100644
--- a/servlet-filterlistener/pom.xml
+++ b/servlet-filterlistener/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/servlet-security/pom.xml b/servlet-security/pom.xml
index cabb4f0806..ab08c26ae0 100644
--- a/servlet-security/pom.xml
+++ b/servlet-security/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/spring-resteasy/pom.xml b/spring-resteasy/pom.xml
index 9919c9bd11..f101e20ad1 100644
--- a/spring-resteasy/pom.xml
+++ b/spring-resteasy/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -49,7 +49,7 @@
         <maven.compiler.source>17</maven.compiler.source>
 
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/tasks-jsf/pom.xml b/tasks-jsf/pom.xml
index 2851a552d3..cac3133f53 100644
--- a/tasks-jsf/pom.xml
+++ b/tasks-jsf/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
diff --git a/temperature-converter/pom.xml b/temperature-converter/pom.xml
index 34339f4d5a..107f9c7606 100644
--- a/temperature-converter/pom.xml
+++ b/temperature-converter/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/thread-racing/pom.xml b/thread-racing/pom.xml
index b4b70bf343..8def7f337c 100644
--- a/thread-racing/pom.xml
+++ b/thread-racing/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/todo-backend/pom.xml b/todo-backend/pom.xml
index 2ceaad79f6..831a4b4e04 100644
--- a/todo-backend/pom.xml
+++ b/todo-backend/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/websocket-endpoint/pom.xml b/websocket-endpoint/pom.xml
index 38f2a4500f..066006dab1 100644
--- a/websocket-endpoint/pom.xml
+++ b/websocket-endpoint/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/websocket-hello/pom.xml b/websocket-hello/pom.xml
index ded8655a81..826bfa6640 100644
--- a/websocket-hello/pom.xml
+++ b/websocket-hello/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
@@ -45,7 +45,7 @@
 
     <properties>
         <!-- the version for the Server -->
-        <version.server>31.0.0.Beta1</version.server>
+        <version.server>31.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
diff --git a/wsat-simple/pom.xml b/wsat-simple/pom.xml
index 4062ff7d0e..c436d4552b 100644
--- a/wsat-simple/pom.xml
+++ b/wsat-simple/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
diff --git a/wsba-coordinator-completion-simple/pom.xml b/wsba-coordinator-completion-simple/pom.xml
index 4df5887110..dc7a1ee4c7 100644
--- a/wsba-coordinator-completion-simple/pom.xml
+++ b/wsba-coordinator-completion-simple/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>
 
diff --git a/wsba-participant-completion-simple/pom.xml b/wsba-participant-completion-simple/pom.xml
index 220372510e..aa5360b3fb 100644
--- a/wsba-participant-completion-simple/pom.xml
+++ b/wsba-participant-completion-simple/pom.xml
@@ -25,7 +25,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>7</version>
+        <version>8</version>
         <relativePath/>
     </parent>