diff --git a/batch-processing/charts/helm.yaml b/batch-processing/charts/helm.yaml
index 76725f9799..8c8ed0848a 100644
--- a/batch-processing/charts/helm.yaml
+++ b/batch-processing/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: batch-processing
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml
index 78667332ad..dd9ead31f5 100644
--- a/batch-processing/pom.xml
+++ b/batch-processing/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>batch-processing</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: batch-processing</name>
     <description>Shows how to use a Chunk oriented batch processing</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/bmt/charts/helm.yaml b/bmt/charts/helm.yaml
index de7dd19e21..b6f5e814f4 100644
--- a/bmt/charts/helm.yaml
+++ b/bmt/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: bmt
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/bmt/pom.xml b/bmt/pom.xml
index f702e485ad..324be9248f 100644
--- a/bmt/pom.xml
+++ b/bmt/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>bmt</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: bmt</name>
     <description>This project demonstrates how to use Bean Managed Transactions</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/cmt/charts/helm.yaml b/cmt/charts/helm.yaml
index 672ba19145..45b5abd781 100644
--- a/cmt/charts/helm.yaml
+++ b/cmt/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: cmt
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/cmt/pom.xml b/cmt/pom.xml
index bc274e91c5..e33466a084 100644
--- a/cmt/pom.xml
+++ b/cmt/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>cmt</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: cmt</name>
     <description>This project demonstrates how to use transactions managed by the container</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/dist/pom.xml b/dist/pom.xml
index c96f673867..588c5a043d 100644
--- a/dist/pom.xml
+++ b/dist/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>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
 
     <artifactId>quickstarts-dist</artifactId>
diff --git a/ee-security/charts/helm.yaml b/ee-security/charts/helm.yaml
index 4c393c54d9..ea6c42c17c 100644
--- a/ee-security/charts/helm.yaml
+++ b/ee-security/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: ee-security
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/ee-security/pom.xml b/ee-security/pom.xml
index 52eb75be8e..76c5246f03 100644
--- a/ee-security/pom.xml
+++ b/ee-security/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>ee-security</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: ee-security</name>
     <description>This project demonstrates using EE security</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/ejb-multi-server/app-main/ear/pom.xml b/ejb-multi-server/app-main/ear/pom.xml
index 8bf1eab3e1..6fa56412e9 100644
--- a/ejb-multi-server/app-main/ear/pom.xml
+++ b/ejb-multi-server/app-main/ear/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-multi-server-app-main</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>ejb-multi-server-app-main-ear</artifactId>
     <packaging>ear</packaging>
diff --git a/ejb-multi-server/app-main/ejb/pom.xml b/ejb-multi-server/app-main/ejb/pom.xml
index 2b32e79205..4601c141dc 100644
--- a/ejb-multi-server/app-main/ejb/pom.xml
+++ b/ejb-multi-server/app-main/ejb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-multi-server-app-main</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>ejb-multi-server-app-main-ejb</artifactId>
     <packaging>ejb</packaging>
diff --git a/ejb-multi-server/app-main/pom.xml b/ejb-multi-server/app-main/pom.xml
index b193cddf87..850770f006 100644
--- a/ejb-multi-server/app-main/pom.xml
+++ b/ejb-multi-server/app-main/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-multi-server</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>ejb-multi-server-app-main</artifactId>
diff --git a/ejb-multi-server/app-main/web/pom.xml b/ejb-multi-server/app-main/web/pom.xml
index b7cd0fe349..03badcc9bf 100644
--- a/ejb-multi-server/app-main/web/pom.xml
+++ b/ejb-multi-server/app-main/web/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-multi-server-app-main</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>ejb-multi-server-app-main-web</artifactId>
     <packaging>war</packaging>
diff --git a/ejb-multi-server/app-one/ear/pom.xml b/ejb-multi-server/app-one/ear/pom.xml
index 15c1bceca5..2bb5db805d 100644
--- a/ejb-multi-server/app-one/ear/pom.xml
+++ b/ejb-multi-server/app-one/ear/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-multi-server-app-one</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>ejb-multi-server-app-one-ear</artifactId>
     <packaging>ear</packaging>
diff --git a/ejb-multi-server/app-one/ejb/pom.xml b/ejb-multi-server/app-one/ejb/pom.xml
index 4df58cadf0..4c3546b881 100644
--- a/ejb-multi-server/app-one/ejb/pom.xml
+++ b/ejb-multi-server/app-one/ejb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-multi-server-app-one</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>ejb-multi-server-app-one-ejb</artifactId>
     <packaging>ejb</packaging>
diff --git a/ejb-multi-server/app-one/pom.xml b/ejb-multi-server/app-one/pom.xml
index 21aa370107..cf18a45e16 100644
--- a/ejb-multi-server/app-one/pom.xml
+++ b/ejb-multi-server/app-one/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-multi-server</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>ejb-multi-server-app-one</artifactId>
     <packaging>pom</packaging>
diff --git a/ejb-multi-server/app-two/ear/pom.xml b/ejb-multi-server/app-two/ear/pom.xml
index 582aed8ec4..86aa7ddc24 100644
--- a/ejb-multi-server/app-two/ear/pom.xml
+++ b/ejb-multi-server/app-two/ear/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-multi-server-app-two</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>ejb-multi-server-app-two-ear</artifactId>
     <packaging>ear</packaging>
diff --git a/ejb-multi-server/app-two/ejb/pom.xml b/ejb-multi-server/app-two/ejb/pom.xml
index 1c5d540faf..48b787a927 100644
--- a/ejb-multi-server/app-two/ejb/pom.xml
+++ b/ejb-multi-server/app-two/ejb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-multi-server-app-two</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>ejb-multi-server-app-two-ejb</artifactId>
     <packaging>ejb</packaging>
diff --git a/ejb-multi-server/app-two/pom.xml b/ejb-multi-server/app-two/pom.xml
index 17e6eaf010..552da85f0d 100644
--- a/ejb-multi-server/app-two/pom.xml
+++ b/ejb-multi-server/app-two/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-multi-server</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>ejb-multi-server-app-two</artifactId>
     <packaging>pom</packaging>
diff --git a/ejb-multi-server/app-web/pom.xml b/ejb-multi-server/app-web/pom.xml
index 408693dbd1..6926bf46fa 100644
--- a/ejb-multi-server/app-web/pom.xml
+++ b/ejb-multi-server/app-web/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-multi-server</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>ejb-multi-server-app-web</artifactId>
     <packaging>war</packaging>
diff --git a/ejb-multi-server/client/pom.xml b/ejb-multi-server/client/pom.xml
index 55116ef17c..e09295ec3f 100644
--- a/ejb-multi-server/client/pom.xml
+++ b/ejb-multi-server/client/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-multi-server</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>ejb-multi-server-client</artifactId>
     <packaging>jar</packaging>
diff --git a/ejb-multi-server/pom.xml b/ejb-multi-server/pom.xml
index 115c82a156..5115c114dd 100644
--- a/ejb-multi-server/pom.xml
+++ b/ejb-multi-server/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>ejb-multi-server</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>pom</packaging>
     <name>Quickstart: ejb-multi-server</name>
     <description>A project that demonstrates multiple applications deployed on different servers.
@@ -49,7 +49,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/ejb-remote/pom.xml b/ejb-remote/pom.xml
index 7a2a327290..73c67d696a 100644
--- a/ejb-remote/pom.xml
+++ b/ejb-remote/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>ejb-remote</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: ejb-remote</name>
     <description>This project demonstrates how to access an EJB from a remote client</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/ejb-security-context-propagation/pom.xml b/ejb-security-context-propagation/pom.xml
index 312804c583..3236da1af3 100644
--- a/ejb-security-context-propagation/pom.xml
+++ b/ejb-security-context-propagation/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>ejb-security-context-propagation</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: ejb-security-context-propagation</name>
     <description>This project demonstrates the security context propagation between remote EJBs</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/ejb-security-programmatic-auth/pom.xml b/ejb-security-programmatic-auth/pom.xml
index bf870da36b..1fb77087aa 100644
--- a/ejb-security-programmatic-auth/pom.xml
+++ b/ejb-security-programmatic-auth/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>ejb-security-programmatic-auth</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: ejb-security-programmatic-auth</name>
     <description>This project demonstrates how to authenticate remote clients using the programmatic API</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
       <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/ejb-throws-exception/ear/pom.xml b/ejb-throws-exception/ear/pom.xml
index 2360c4a265..b24f4f79d6 100644
--- a/ejb-throws-exception/ear/pom.xml
+++ b/ejb-throws-exception/ear/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-throws-exception</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>ejb-throws-exception-ear</artifactId>
     <packaging>ear</packaging>
diff --git a/ejb-throws-exception/ejb-api/pom.xml b/ejb-throws-exception/ejb-api/pom.xml
index ba8d0eb288..39b0a42111 100644
--- a/ejb-throws-exception/ejb-api/pom.xml
+++ b/ejb-throws-exception/ejb-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-throws-exception</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>ejb-throws-exception-ejb-api</artifactId>
     <packaging>jar</packaging>
diff --git a/ejb-throws-exception/ejb/pom.xml b/ejb-throws-exception/ejb/pom.xml
index e4454465d2..18f1a91de5 100644
--- a/ejb-throws-exception/ejb/pom.xml
+++ b/ejb-throws-exception/ejb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-throws-exception</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>ejb-throws-exception-ejb</artifactId>
     <packaging>ejb</packaging>
diff --git a/ejb-throws-exception/pom.xml b/ejb-throws-exception/pom.xml
index 34d9ec4350..c4e0d821db 100644
--- a/ejb-throws-exception/pom.xml
+++ b/ejb-throws-exception/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>ejb-throws-exception</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>pom</packaging>
     <name>Quickstart: ejb-throws-exception</name>
     <description>This project demonstrates how to throw an exception in an EJB and catch it in the web layer</description>
@@ -53,7 +53,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/ejb-throws-exception/web/pom.xml b/ejb-throws-exception/web/pom.xml
index 66beac9dc1..5ffe6c41da 100644
--- a/ejb-throws-exception/web/pom.xml
+++ b/ejb-throws-exception/web/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>ejb-throws-exception</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>ejb-throws-exception-web</artifactId>
     <packaging>war</packaging>
diff --git a/ejb-timer/charts/helm.yaml b/ejb-timer/charts/helm.yaml
index 48509a377b..eb99d81696 100644
--- a/ejb-timer/charts/helm.yaml
+++ b/ejb-timer/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: ejb-timer
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/ejb-timer/pom.xml b/ejb-timer/pom.xml
index 38775189fc..949de207ae 100644
--- a/ejb-timer/pom.xml
+++ b/ejb-timer/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>ejb-timer</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: ejb-timer</name>
     <description>A sample Jakarta EE project demonstrating how to use EJB timer (@Schedule and @Timeout).</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/ejb-txn-remote-call/charts/client.yaml b/ejb-txn-remote-call/charts/client.yaml
index 7d2a2ddeae..ea23f493c5 100644
--- a/ejb-txn-remote-call/charts/client.yaml
+++ b/ejb-txn-remote-call/charts/client.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: ejb-txn-remote-call/client
   env:
     - name: MAVEN_ARGS_APPEND
diff --git a/ejb-txn-remote-call/charts/server.yaml b/ejb-txn-remote-call/charts/server.yaml
index 3873e45900..26a00f1341 100644
--- a/ejb-txn-remote-call/charts/server.yaml
+++ b/ejb-txn-remote-call/charts/server.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: ejb-txn-remote-call/server
 deploy:
   enabled: false
diff --git a/ejb-txn-remote-call/client/pom.xml b/ejb-txn-remote-call/client/pom.xml
index f7b34a48f3..7d94858c27 100644
--- a/ejb-txn-remote-call/client/pom.xml
+++ b/ejb-txn-remote-call/client/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>ejb-txn-remote-call-client</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: ejb-txn-remote-call-client</name>
     <description>The project is the application to be deployed on the client server to call the second server</description>
@@ -39,7 +39,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/ejb-txn-remote-call/pom.xml b/ejb-txn-remote-call/pom.xml
index 7a01b05f42..6f77234d2b 100644
--- a/ejb-txn-remote-call/pom.xml
+++ b/ejb-txn-remote-call/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>ejb-txn-remote-call</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>pom</packaging>
     <name>Quickstart: ejb-txn-remote-call</name>
     <description>The project demonstrates how to make EJB remote calls from server to server with transaction propagation.
diff --git a/ejb-txn-remote-call/server/pom.xml b/ejb-txn-remote-call/server/pom.xml
index 9e23f1dd36..2a2072a7e9 100644
--- a/ejb-txn-remote-call/server/pom.xml
+++ b/ejb-txn-remote-call/server/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>ejb-txn-remote-call-server</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: ejb-txn-remote-call-server</name>
     <description>The project is the application to be deployed on the second server to receive the call</description>
@@ -39,7 +39,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/ha-singleton-deployment/pom.xml b/ha-singleton-deployment/pom.xml
index e3f01b9573..d959d61e2b 100644
--- a/ha-singleton-deployment/pom.xml
+++ b/ha-singleton-deployment/pom.xml
@@ -36,7 +36,7 @@
     </parent>
 
     <artifactId>ha-singleton-deployment</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: HA Singleton Deployment</name>
     <description>This quickstart demonstrates the recommended way to deploy any service as a cluster-wide singleton.</description>
@@ -53,7 +53,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/ha-singleton-service/pom.xml b/ha-singleton-service/pom.xml
index cc67a59ef5..5fafa97f6b 100644
--- a/ha-singleton-service/pom.xml
+++ b/ha-singleton-service/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ha-singleton-service</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: HA Singleton Service</name>
     <description>This quickstart demonstrates a singleton MSC service packaged in a war.</description>
@@ -48,7 +48,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml
index 77f0c4f711..d86f1fd6c0 100644
--- a/helloworld-jms/pom.xml
+++ b/helloworld-jms/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>helloworld-jms</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>jar</packaging>
     <name>Quickstart: helloworld-jms</name>
     <description>A Helloworld JMS external producer/consumer client</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/helloworld-mdb/charts/helm.yaml b/helloworld-mdb/charts/helm.yaml
index ac3cf2bd19..c918587af9 100644
--- a/helloworld-mdb/charts/helm.yaml
+++ b/helloworld-mdb/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: helloworld-mdb
 deploy:
   replicas: 2
\ No newline at end of file
diff --git a/helloworld-mdb/pom.xml b/helloworld-mdb/pom.xml
index d40c23cd5b..f831d9e777 100644
--- a/helloworld-mdb/pom.xml
+++ b/helloworld-mdb/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>helloworld-mdb</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: helloworld-mdb</name>
     <description>This project demonstrates a hello world Message-Driven Bean with Servlet 3.0 as client</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/helloworld-mutual-ssl-secured/pom.xml b/helloworld-mutual-ssl-secured/pom.xml
index e37e8db2a6..3c85f0d5d4 100644
--- a/helloworld-mutual-ssl-secured/pom.xml
+++ b/helloworld-mutual-ssl-secured/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>helloworld-mutual-ssl-secured</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: helloworld-mutual-ssl-secured</name>
     <description>Securing helloworld Web app with mutual client ssl authentication and role-based access control</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/helloworld-mutual-ssl/pom.xml b/helloworld-mutual-ssl/pom.xml
index c99869fe6a..d2f627ac16 100644
--- a/helloworld-mutual-ssl/pom.xml
+++ b/helloworld-mutual-ssl/pom.xml
@@ -34,14 +34,14 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
     </properties>
 
     <artifactId>helloworld-mutual-ssl</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: helloworld-mutual-ssl</name>
     <description>Helloworld Mutual SSL Authentication</description>
diff --git a/helloworld-rs/charts/helm.yaml b/helloworld-rs/charts/helm.yaml
index b8d1283063..ddb2e836da 100644
--- a/helloworld-rs/charts/helm.yaml
+++ b/helloworld-rs/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: helloworld-rs
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/helloworld-rs/pom.xml b/helloworld-rs/pom.xml
index 63b2d56569..7c04f23944 100644
--- a/helloworld-rs/pom.xml
+++ b/helloworld-rs/pom.xml
@@ -17,7 +17,7 @@
         <relativePath/>
     </parent>
     <artifactId>helloworld-rs</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: helloworld-rs</name>
     <description>A simple Hello World project that uses Jakarta RESTful Web Services</description>
@@ -34,7 +34,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/helloworld-singleton/charts/helm.yaml b/helloworld-singleton/charts/helm.yaml
index c3dda38fcd..46a789aede 100644
--- a/helloworld-singleton/charts/helm.yaml
+++ b/helloworld-singleton/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: helloworld-singleton
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/helloworld-singleton/pom.xml b/helloworld-singleton/pom.xml
index 1e81ed5ef5..868db014ff 100644
--- a/helloworld-singleton/pom.xml
+++ b/helloworld-singleton/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>helloworld-singleton</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: helloworld-singleton</name>
     <description>This project demonstrates a Hello World Singleton Session Bean with a JSF client</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/helloworld-ws/charts/helm.yaml b/helloworld-ws/charts/helm.yaml
index 86e1ccf577..0153cab2f5 100644
--- a/helloworld-ws/charts/helm.yaml
+++ b/helloworld-ws/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: helloworld-ws
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/helloworld-ws/pom.xml b/helloworld-ws/pom.xml
index a9a180317c..cbba65e446 100644
--- a/helloworld-ws/pom.xml
+++ b/helloworld-ws/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>helloworld-ws</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: helloworld-ws</name>
     <description>This project demonstrates a Hello World JAX-WS web service</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/helloworld/charts/helm.yaml b/helloworld/charts/helm.yaml
index cf70083673..c420a933b9 100644
--- a/helloworld/charts/helm.yaml
+++ b/helloworld/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: helloworld
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index 7a4dd9015b..c67b6ed3cf 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>helloworld</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: helloworld</name>
     <description>Helloworld</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/hibernate/charts/helm.yaml b/hibernate/charts/helm.yaml
index fa78d17df7..1ee28fc170 100644
--- a/hibernate/charts/helm.yaml
+++ b/hibernate/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: hibernate
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/hibernate/pom.xml b/hibernate/pom.xml
index b456eb35a7..1224995f45 100644
--- a/hibernate/pom.xml
+++ b/hibernate/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>hibernate</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: hibernate</name>
     <description>This project demonstrates how to use Hibernate ORM</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/http-custom-mechanism/custom-module/pom.xml b/http-custom-mechanism/custom-module/pom.xml
index 664b205ae9..2cf8ec7a1d 100644
--- a/http-custom-mechanism/custom-module/pom.xml
+++ b/http-custom-mechanism/custom-module/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>http-custom-mechanism</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/http-custom-mechanism/pom.xml b/http-custom-mechanism/pom.xml
index f07b2f7561..4dc619083a 100644
--- a/http-custom-mechanism/pom.xml
+++ b/http-custom-mechanism/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>http-custom-mechanism</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>pom</packaging>
     <name>Quickstart: http-custom-mechanism</name>
     <description>This project demonstrates how to implement a custom HTTP authentication mechanism</description>
@@ -52,7 +52,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/http-custom-mechanism/webapp/pom.xml b/http-custom-mechanism/webapp/pom.xml
index f657203d0a..fbe8cbe414 100644
--- a/http-custom-mechanism/webapp/pom.xml
+++ b/http-custom-mechanism/webapp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>http-custom-mechanism</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>http-custom-mechanism-webapp</artifactId>
diff --git a/jaxrs-client/charts/helm.yaml b/jaxrs-client/charts/helm.yaml
index 3e17b4ab5f..aa1d7dc430 100644
--- a/jaxrs-client/charts/helm.yaml
+++ b/jaxrs-client/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: jaxrs-client
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml
index 25baadeaf2..36ffb1716b 100644
--- a/jaxrs-client/pom.xml
+++ b/jaxrs-client/pom.xml
@@ -30,7 +30,7 @@
         <relativePath/>
     </parent>
     <artifactId>jaxrs-client</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: jaxrs-client</name>
     <description>A Jakarta REST Client API project</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/jaxrs-jwt/charts/helm.yaml b/jaxrs-jwt/charts/helm.yaml
index d9c4d656db..f7a2e06f22 100644
--- a/jaxrs-jwt/charts/helm.yaml
+++ b/jaxrs-jwt/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: jaxrs-jwt
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/jaxrs-jwt/pom.xml b/jaxrs-jwt/pom.xml
index db3384058f..6bc98e295f 100644
--- a/jaxrs-jwt/pom.xml
+++ b/jaxrs-jwt/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>jaxrs-jwt</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: jaxrs-jwt</name>
     <description>JWT authentication using Elytron</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the server version -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/jaxws-ejb/charts/helm.yaml b/jaxws-ejb/charts/helm.yaml
index fb4da91070..6b81a29e68 100644
--- a/jaxws-ejb/charts/helm.yaml
+++ b/jaxws-ejb/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: jaxws-ejb
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/jaxws-ejb/pom.xml b/jaxws-ejb/pom.xml
index a4ddfffa12..58acf6167a 100644
--- a/jaxws-ejb/pom.xml
+++ b/jaxws-ejb/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>jaxws-ejb</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: jaxws-ejb</name>
     <description>This project is a working example of a JAX-WS web service EJB endpoint</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/jaxws-retail/charts/helm.yaml b/jaxws-retail/charts/helm.yaml
index 110f339a2d..b1cb4a1246 100644
--- a/jaxws-retail/charts/helm.yaml
+++ b/jaxws-retail/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: jaxws-retail
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/jaxws-retail/pom.xml b/jaxws-retail/pom.xml
index 886f7a268c..3c7c957533 100644
--- a/jaxws-retail/pom.xml
+++ b/jaxws-retail/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>jaxws-retail</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>    
+    <version>40.0.0.Final</version>    
     <packaging>war</packaging>
     <name>Quickstart: jaxws-retail</name>
     <description>This project is a working example of a JAX-WS web service retail endpoint</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/jsonp/charts/helm.yaml b/jsonp/charts/helm.yaml
index ff181f49c8..e42faf3eab 100644
--- a/jsonp/charts/helm.yaml
+++ b/jsonp/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: jsonp
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/jsonp/pom.xml b/jsonp/pom.xml
index b765753e86..376a9f1abd 100644
--- a/jsonp/pom.xml
+++ b/jsonp/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>jsonp</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: jsonp</name>
     <description>A starter Jakarta EE webapp project for use on JBoss EAP</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/jta-crash-rec/pom.xml b/jta-crash-rec/pom.xml
index 6c65174501..b2795b3a5b 100644
--- a/jta-crash-rec/pom.xml
+++ b/jta-crash-rec/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>jta-crash-rec</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: jta-crash-rec</name>
     <description>This project demonstrates JTA crash recovery</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/jts/application-component-1/pom.xml b/jts/application-component-1/pom.xml
index c4f946fe03..9ed189fd41 100644
--- a/jts/application-component-1/pom.xml
+++ b/jts/application-component-1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>jts</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>jts-application-component-1</artifactId>
     <packaging>war</packaging>
diff --git a/jts/application-component-2/pom.xml b/jts/application-component-2/pom.xml
index f256934dc2..11c29d10d5 100644
--- a/jts/application-component-2/pom.xml
+++ b/jts/application-component-2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>jts</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>jts-application-component-2</artifactId>
     <name>Quickstart: jts - application-component-2</name>
diff --git a/jts/pom.xml b/jts/pom.xml
index cdbecb3b2c..336cf44017 100644
--- a/jts/pom.xml
+++ b/jts/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <!-- TODO fix artifact name to match components -->
     <artifactId>jts</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>pom</packaging>
     <name>Quickstart: jts</name>
     <description>A project that demonstrates how to use CMT with JTS</description>
@@ -54,7 +54,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Dependencies and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/kitchensink/charts/helm.yaml b/kitchensink/charts/helm.yaml
index 07593d4f85..1f92a71346 100644
--- a/kitchensink/charts/helm.yaml
+++ b/kitchensink/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: kitchensink
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml
index 67710dcd0e..e15b8e86fd 100644
--- a/kitchensink/pom.xml
+++ b/kitchensink/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>kitchensink</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: kitchensink</name>
     <description>A starter Jakarta EE web application project for use in JBoss EAP</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/logging/charts/helm.yaml b/logging/charts/helm.yaml
index f3e9d294ce..0578b9f41d 100644
--- a/logging/charts/helm.yaml
+++ b/logging/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: logging
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/logging/pom.xml b/logging/pom.xml
index d8e79a7c33..94da5b7198 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>logging</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: logging</name>
     <description>This project demonstrates logging in JBoss EAP</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- The version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/mail/charts/helm.yaml b/mail/charts/helm.yaml
index fd87ae08ae..c73a65ddfe 100644
--- a/mail/charts/helm.yaml
+++ b/mail/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: mail
 deploy:
   replicas: 1
diff --git a/mail/pom.xml b/mail/pom.xml
index 2b8170bd29..6b2759c823 100644
--- a/mail/pom.xml
+++ b/mail/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>mail</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: mail</name>
     <description>This project demonstrates how to send mail</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/messaging-clustering-singleton/pom.xml b/messaging-clustering-singleton/pom.xml
index c49d6cbf4a..fcdc1af5e5 100644
--- a/messaging-clustering-singleton/pom.xml
+++ b/messaging-clustering-singleton/pom.xml
@@ -29,7 +29,7 @@
     </parent>
 
     <artifactId>messaging-clustering-singleton</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: messaging-clustering-singleton</name>
     <description>This project demonstrates a hello world Message-Driven Bean with Servlet 3.0 as client</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/micrometer/charts/helm.yaml b/micrometer/charts/helm.yaml
index c0bbbce795..bb856d6563 100644
--- a/micrometer/charts/helm.yaml
+++ b/micrometer/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: micrometer
 deploy:
   replicas: 1
diff --git a/micrometer/pom.xml b/micrometer/pom.xml
index ecaa25de89..ef98b98008 100644
--- a/micrometer/pom.xml
+++ b/micrometer/pom.xml
@@ -15,7 +15,7 @@
     </parent>
 
     <artifactId>micrometer</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
 
     <name>Quickstart: micrometer</name>
@@ -24,7 +24,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.expansion>${version.server}</version.bom.expansion>
diff --git a/microprofile-config/charts/helm.yaml b/microprofile-config/charts/helm.yaml
index c32c42525c..43a44dca83 100644
--- a/microprofile-config/charts/helm.yaml
+++ b/microprofile-config/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: microprofile-config
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/microprofile-config/pom.xml b/microprofile-config/pom.xml
index 51a427787e..7d490c8836 100644
--- a/microprofile-config/pom.xml
+++ b/microprofile-config/pom.xml
@@ -13,7 +13,7 @@
     </parent>
 
     <artifactId>microprofile-config</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
 
     <name>Quickstart: microprofile-config</name>
@@ -22,7 +22,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.expansion>${version.server}</version.bom.expansion>
diff --git a/microprofile-fault-tolerance/charts/helm.yaml b/microprofile-fault-tolerance/charts/helm.yaml
index 88695c5b84..240d3d74a4 100644
--- a/microprofile-fault-tolerance/charts/helm.yaml
+++ b/microprofile-fault-tolerance/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: microprofile-fault-tolerance
 deploy:
   replicas: 1
diff --git a/microprofile-fault-tolerance/pom.xml b/microprofile-fault-tolerance/pom.xml
index 8ba874883d..1d6d9974c3 100644
--- a/microprofile-fault-tolerance/pom.xml
+++ b/microprofile-fault-tolerance/pom.xml
@@ -30,7 +30,7 @@
         <relativePath/>
     </parent>
     <artifactId>microprofile-fault-tolerance</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: microprofile-fault-tolerance</name>
     <description>
@@ -55,7 +55,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.expansion>${version.server}</version.bom.expansion>
diff --git a/microprofile-health/charts/helm.yaml b/microprofile-health/charts/helm.yaml
index a925c5de44..82366669a3 100644
--- a/microprofile-health/charts/helm.yaml
+++ b/microprofile-health/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: microprofile-health
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/microprofile-health/pom.xml b/microprofile-health/pom.xml
index 0f315dde1d..6fbeea0005 100644
--- a/microprofile-health/pom.xml
+++ b/microprofile-health/pom.xml
@@ -13,7 +13,7 @@
     </parent>
 
     <artifactId>microprofile-health</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: microprofile-health</name>
 
@@ -21,7 +21,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.expansion>${version.server}</version.bom.expansion>
diff --git a/microprofile-jwt/charts/helm.yaml b/microprofile-jwt/charts/helm.yaml
index 515e907085..3560d218ac 100644
--- a/microprofile-jwt/charts/helm.yaml
+++ b/microprofile-jwt/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: microprofile-jwt
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/microprofile-jwt/pom.xml b/microprofile-jwt/pom.xml
index d1990fc7cd..e120c47b60 100644
--- a/microprofile-jwt/pom.xml
+++ b/microprofile-jwt/pom.xml
@@ -29,7 +29,7 @@
     </parent>
 
     <artifactId>microprofile-jwt</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: microprofile-jwt</name>
     <description>Example project making use of MicroProfile JWT</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.expansion>${version.server}</version.bom.expansion>
diff --git a/microprofile-lra/charts/helm.yaml b/microprofile-lra/charts/helm.yaml
index 67598c049f..86f82ef9b4 100644
--- a/microprofile-lra/charts/helm.yaml
+++ b/microprofile-lra/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: microprofile-lra
 deploy:
   replicas: 1
diff --git a/microprofile-lra/pom.xml b/microprofile-lra/pom.xml
index d96ad18876..509b61e287 100644
--- a/microprofile-lra/pom.xml
+++ b/microprofile-lra/pom.xml
@@ -13,7 +13,7 @@
     </parent>
 
     <artifactId>microprofile-lra</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: microprofile-lra</name>
 
@@ -21,7 +21,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.expansion>${version.server}</version.bom.expansion>
diff --git a/microprofile-openapi/charts/helm.yaml b/microprofile-openapi/charts/helm.yaml
index e539344a2f..1833afc38e 100644
--- a/microprofile-openapi/charts/helm.yaml
+++ b/microprofile-openapi/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: microprofile-openapi
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/microprofile-openapi/pom.xml b/microprofile-openapi/pom.xml
index cf6c45e489..080d7b794a 100644
--- a/microprofile-openapi/pom.xml
+++ b/microprofile-openapi/pom.xml
@@ -14,7 +14,7 @@
     </parent>
 
     <artifactId>microprofile-openapi</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
 
     <name>Quickstart: microprofile-openapi</name>
@@ -23,7 +23,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.expansion>${version.server}</version.bom.expansion>
diff --git a/microprofile-reactive-messaging-kafka/charts/helm.yaml b/microprofile-reactive-messaging-kafka/charts/helm.yaml
index b708d5817a..7341083819 100644
--- a/microprofile-reactive-messaging-kafka/charts/helm.yaml
+++ b/microprofile-reactive-messaging-kafka/charts/helm.yaml
@@ -2,7 +2,7 @@
 # Will need a diff commit in the upstream-to-product repository
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: microprofile-reactive-messaging-kafka
 deploy:
   replicas: 1
diff --git a/microprofile-reactive-messaging-kafka/pom.xml b/microprofile-reactive-messaging-kafka/pom.xml
index 81a1d39541..66e8d6aa15 100644
--- a/microprofile-reactive-messaging-kafka/pom.xml
+++ b/microprofile-reactive-messaging-kafka/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>microprofile-reactive-messaging-kafka</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
 
     <name>Quickstart: microprofile-reactive-messaging-kafka</name>
@@ -38,7 +38,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.expansion>${version.server}</version.bom.expansion>
diff --git a/microprofile-rest-client/charts/helm.yaml b/microprofile-rest-client/charts/helm.yaml
index 16a15af18f..24a7017014 100644
--- a/microprofile-rest-client/charts/helm.yaml
+++ b/microprofile-rest-client/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: microprofile-rest-client
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/microprofile-rest-client/pom.xml b/microprofile-rest-client/pom.xml
index dc18d2112b..98f40ecff1 100644
--- a/microprofile-rest-client/pom.xml
+++ b/microprofile-rest-client/pom.xml
@@ -28,7 +28,7 @@
         <relativePath/>
     </parent>
     <artifactId>microprofile-rest-client</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: microprofile-rest-client</name>
 
@@ -44,7 +44,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.expansion>${version.server}</version.bom.expansion>
diff --git a/numberguess/charts/helm.yaml b/numberguess/charts/helm.yaml
index 716217e700..ac7e69bc32 100644
--- a/numberguess/charts/helm.yaml
+++ b/numberguess/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: numberguess
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/numberguess/pom.xml b/numberguess/pom.xml
index ec102d526b..92915662ab 100644
--- a/numberguess/pom.xml
+++ b/numberguess/pom.xml
@@ -29,7 +29,7 @@
         <relativePath/>
     </parent>
     <artifactId>numberguess</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: numberguess</name>
     <description>The numberguess project demonstrates the use of CDI and JSF in JBoss EAP</description>
@@ -46,7 +46,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/opentelemetry-tracing/charts/helm.yaml b/opentelemetry-tracing/charts/helm.yaml
index 489caf0c20..3ddaa01ff1 100644
--- a/opentelemetry-tracing/charts/helm.yaml
+++ b/opentelemetry-tracing/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: opentelemetry-tracing
 deploy:
   replicas: 1
diff --git a/opentelemetry-tracing/pom.xml b/opentelemetry-tracing/pom.xml
index 8597b88c11..eb78443cd7 100644
--- a/opentelemetry-tracing/pom.xml
+++ b/opentelemetry-tracing/pom.xml
@@ -13,7 +13,7 @@
     </parent>
 
     <artifactId>opentelemetry-tracing</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
 
     <name>Quickstart: opentelemetry-tracing</name>
@@ -22,7 +22,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.expansion>${version.server}</version.bom.expansion>
diff --git a/pom.xml b/pom.xml
index 2f47378b77..26efd0d6ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,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>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
 
     <packaging>pom</packaging>
 
diff --git a/remote-helloworld-mdb/charts/helm.yaml b/remote-helloworld-mdb/charts/helm.yaml
index ee322eddb0..99b5ce8199 100644
--- a/remote-helloworld-mdb/charts/helm.yaml
+++ b/remote-helloworld-mdb/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: remote-helloworld-mdb
 deploy:
   replicas: 1
diff --git a/remote-helloworld-mdb/pom.xml b/remote-helloworld-mdb/pom.xml
index e0202d5bf6..0e87d999ea 100644
--- a/remote-helloworld-mdb/pom.xml
+++ b/remote-helloworld-mdb/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>remote-helloworld-mdb</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: remote-helloworld-mdb</name>
     <description>This project demonstrates a hello world Message-Driven Bean with Servlet 6.0 as client to a remote Artemis instance</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/security-domain-to-domain/ear/pom.xml b/security-domain-to-domain/ear/pom.xml
index 0fc4c94d84..7b3cef12dd 100644
--- a/security-domain-to-domain/ear/pom.xml
+++ b/security-domain-to-domain/ear/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>security-domain-to-domain</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>security-domain-to-domain-ear</artifactId>
     <packaging>ear</packaging>
diff --git a/security-domain-to-domain/ejb/pom.xml b/security-domain-to-domain/ejb/pom.xml
index 03191da874..0d73a79966 100644
--- a/security-domain-to-domain/ejb/pom.xml
+++ b/security-domain-to-domain/ejb/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>security-domain-to-domain</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>security-domain-to-domain-ejb</artifactId>
     <name>Quickstart: security-domain-to-domain - ejb</name>
diff --git a/security-domain-to-domain/pom.xml b/security-domain-to-domain/pom.xml
index c574b0d067..0e02062b1b 100644
--- a/security-domain-to-domain/pom.xml
+++ b/security-domain-to-domain/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>security-domain-to-domain</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>pom</packaging>
     <name>Quickstart: security-domain-to-domain</name>
     <description>This project demonstrates identity propagation between different security domains</description>
@@ -54,7 +54,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/security-domain-to-domain/test/pom.xml b/security-domain-to-domain/test/pom.xml
index 972236a0d2..3c68a6fd2c 100644
--- a/security-domain-to-domain/test/pom.xml
+++ b/security-domain-to-domain/test/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>security-domain-to-domain</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
     </parent>
     <artifactId>security-domain-to-domain-test</artifactId>
 
diff --git a/security-domain-to-domain/web/pom.xml b/security-domain-to-domain/web/pom.xml
index 91182dc595..377495ee71 100644
--- a/security-domain-to-domain/web/pom.xml
+++ b/security-domain-to-domain/web/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.wildfly.quickstarts</groupId>
         <artifactId>security-domain-to-domain</artifactId>
-        <version>40.0.0.Final-SNAPSHOT</version>
+        <version>40.0.0.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>security-domain-to-domain-web</artifactId>
diff --git a/servlet-async/charts/helm.yaml b/servlet-async/charts/helm.yaml
index 7aac2f622d..e23e33471c 100644
--- a/servlet-async/charts/helm.yaml
+++ b/servlet-async/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: servlet-async
 deploy:
   replicas: 2
\ No newline at end of file
diff --git a/servlet-async/pom.xml b/servlet-async/pom.xml
index 7e6bbdc5cb..3cadfee1dd 100644
--- a/servlet-async/pom.xml
+++ b/servlet-async/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>servlet-async</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: servlet-async</name>
     <description>This project demonstrates an asynchronous Servlet</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/servlet-filterlistener/charts/helm.yaml b/servlet-filterlistener/charts/helm.yaml
index dca2e1b81e..86845aac7c 100644
--- a/servlet-filterlistener/charts/helm.yaml
+++ b/servlet-filterlistener/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: servlet-filterlistener
 deploy:
   replicas: 2
\ No newline at end of file
diff --git a/servlet-filterlistener/pom.xml b/servlet-filterlistener/pom.xml
index 768f990102..f451b38d49 100644
--- a/servlet-filterlistener/pom.xml
+++ b/servlet-filterlistener/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>servlet-filterlistener</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: servlet-filterlistener</name>
     <description>This project demonstrates a Servlet Filter and Listener</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/servlet-security/charts/helm.yaml b/servlet-security/charts/helm.yaml
index 6d710d083a..c0a39e6d2b 100644
--- a/servlet-security/charts/helm.yaml
+++ b/servlet-security/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: servlet-security
 deploy:
   replicas: 1
diff --git a/servlet-security/pom.xml b/servlet-security/pom.xml
index 3180376a56..7ef8640c35 100644
--- a/servlet-security/pom.xml
+++ b/servlet-security/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>servlet-security</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: servlet-security</name>
     <description>This project demonstrates servlet security in JBoss EAP</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/shared-doc/attributes.adoc b/shared-doc/attributes.adoc
index f1964f7dd1..5a1502364b 100644
--- a/shared-doc/attributes.adoc
+++ b/shared-doc/attributes.adoc
@@ -57,7 +57,7 @@ ifndef::ProductRelease,EAPXPRelease[]
 :productVersion: 40
 :githubRepoUrl: https://github.com/wildfly/quickstart/
 :githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 40.0.0.Beta1
+:WildFlyQuickStartRepoTag: 40.0.0.Final
 :DocInfoProductName: Red Hat JBoss Enterprise Application Platform
 :DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
 :DocInfoPreviousProductName: jboss-enterprise-application-platform
diff --git a/spring-resteasy/charts/helm.yaml b/spring-resteasy/charts/helm.yaml
index 4d1d940e24..94672286d5 100644
--- a/spring-resteasy/charts/helm.yaml
+++ b/spring-resteasy/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: spring-resteasy
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/spring-resteasy/pom.xml b/spring-resteasy/pom.xml
index 7a2e2c0543..a5473a966c 100644
--- a/spring-resteasy/pom.xml
+++ b/spring-resteasy/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>spring-resteasy</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: spring-resteasy</name>
     <description>This project demonstrates Spring with a Jakarta REST RestEasy client</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/tasks-jsf/charts/helm.yaml b/tasks-jsf/charts/helm.yaml
index ae14e27a5c..8fbf900a01 100644
--- a/tasks-jsf/charts/helm.yaml
+++ b/tasks-jsf/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: tasks-jsf
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/tasks-jsf/pom.xml b/tasks-jsf/pom.xml
index 832e7c4007..d29ccc7e86 100644
--- a/tasks-jsf/pom.xml
+++ b/tasks-jsf/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>tasks-jsf</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: tasks-jsf</name>
     <description>This project demonstrates how to use JPA persistence to manage tasks with JSF as view layer</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/temperature-converter/charts/helm.yaml b/temperature-converter/charts/helm.yaml
index 629e4ca523..cf615a6218 100644
--- a/temperature-converter/charts/helm.yaml
+++ b/temperature-converter/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: temperature-converter
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/temperature-converter/pom.xml b/temperature-converter/pom.xml
index 2d13ef5d9c..25c00b1d8c 100644
--- a/temperature-converter/pom.xml
+++ b/temperature-converter/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>temperature-converter</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: temperature-converter</name>
     <description>This project is a temperature converter. Given Celsius return Fahrenheit; Given Fahrenheit return Celsius</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/thread-racing/charts/helm.yaml b/thread-racing/charts/helm.yaml
index 4ed9f36167..cd3b940f8f 100644
--- a/thread-racing/charts/helm.yaml
+++ b/thread-racing/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: thread-racing
 deploy:
   replicas: 1
\ No newline at end of file
diff --git a/thread-racing/pom.xml b/thread-racing/pom.xml
index 2b268e309f..343e35438e 100644
--- a/thread-racing/pom.xml
+++ b/thread-racing/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>thread-racing</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: thread-racing</name>
     <description>A web application that triggers a thread race to complete Jakarta EE related tasks</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/todo-backend/charts/values.yaml b/todo-backend/charts/values.yaml
index c3d42bd029..db4ada3469 100644
--- a/todo-backend/charts/values.yaml
+++ b/todo-backend/charts/values.yaml
@@ -10,7 +10,7 @@ db:
 wildfly:
     build:
       uri: https://github.com/wildfly/quickstart.git
-      ref: main
+      ref: 40.x
       contextDir: todo-backend
     deploy:
       replicas: 1
diff --git a/todo-backend/pom.xml b/todo-backend/pom.xml
index ff92f1d48f..e8dd0e5f6c 100644
--- a/todo-backend/pom.xml
+++ b/todo-backend/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>todo-backend</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: todo-backend</name>
     <description>This project demonstrates how to implement a Todo-Backend application to manage ToDos</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/websocket-endpoint/charts/helm.yaml b/websocket-endpoint/charts/helm.yaml
index 98d316c0d0..a5455763cf 100644
--- a/websocket-endpoint/charts/helm.yaml
+++ b/websocket-endpoint/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: websocket-endpoint
 deploy:
   replicas: 2
\ No newline at end of file
diff --git a/websocket-endpoint/pom.xml b/websocket-endpoint/pom.xml
index 086a5a2660..adfbd2e45b 100644
--- a/websocket-endpoint/pom.xml
+++ b/websocket-endpoint/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>websocket-endpoint</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: websocket-endpoint</name>
     <description>This project demonstrates how to use a WebSocket Endppoint</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>
diff --git a/websocket-hello/charts/helm.yaml b/websocket-hello/charts/helm.yaml
index f15b8656c7..00b3d47514 100644
--- a/websocket-hello/charts/helm.yaml
+++ b/websocket-hello/charts/helm.yaml
@@ -1,6 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: main
+  ref: 40.x
   contextDir: websocket-hello
 deploy:
   replicas: 2
\ No newline at end of file
diff --git a/websocket-hello/pom.xml b/websocket-hello/pom.xml
index 21f79ca6a2..ad2f46afcc 100644
--- a/websocket-hello/pom.xml
+++ b/websocket-hello/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>websocket-hello</artifactId>
-    <version>40.0.0.Final-SNAPSHOT</version>
+    <version>40.0.0.Final</version>
     <packaging>war</packaging>
     <name>Quickstart: websocket-hello</name>
     <description>This project demonstrates a simple Hello WebSocket application</description>
@@ -47,7 +47,7 @@
         <!-- the Maven project should use the minimum Java SE version supported -->
         <maven.compiler.release>17</maven.compiler.release>
         <!-- the version for the Server -->
-        <version.server>40.0.0.Beta1</version.server>
+        <version.server>40.0.0.Final</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>6.0.0.Final</version.plugin.wildfly>