diff --git a/apps/pom.xml b/apps/pom.xml
index 787c3ec93c..38e1a214b0 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
     <artifactId>struts2-apps</artifactId>
     <packaging>pom</packaging>
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 3b2a7ac6cd..f476e735cf 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -24,12 +24,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
-    <version>7.0.0-M6-SNAPSHOT</version>
+    <version>7.0.0-M6</version>
     <name>Struts 2 Rest Showcase Webapp</name>
     <description>Struts 2 Rest Showcase Example</description>
 
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 900a3ae8c8..c558edf65a 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-showcase</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 4fb804e25e..f2c1225c6b 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-assembly</artifactId>
diff --git a/bom/pom.xml b/bom/pom.xml
index 25303221be..261ea073f9 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-bom</artifactId>
-    <version>7.0.0-M6-SNAPSHOT</version>
+    <version>7.0.0-M6</version>
     <packaging>pom</packaging>
 
     <name>Struts 2 Bill of Materials</name>
@@ -44,7 +44,7 @@
     </licenses>
 
     <properties>
-        <struts-version.version>7.0.0-M6-SNAPSHOT</struts-version.version>
+        <struts-version.version>7.0.0-M6</struts-version.version>
         <maven.site.skip>true</maven.site.skip>
         <maven.site.deploy.skip>true</maven.site.deploy.skip>
     </properties>
@@ -165,7 +165,7 @@
     </dependencyManagement>
 
   <scm>
-    <tag>HEAD</tag>
+    <tag>STRUTS_7_0_0_M6</tag>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</developerConnection>
     <url>https://github.com/apache/struts/</url>
diff --git a/core/pom.xml b/core/pom.xml
index fdba1e65a6..520bb27143 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
     <artifactId>struts2-core</artifactId>
     <packaging>jar</packaging>
diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml
index c80a017400..8b3ff585be 100644
--- a/jakarta/freemarker-jakarta/pom.xml
+++ b/jakarta/freemarker-jakarta/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-jakarta</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
     <artifactId>struts2-freemarker-jakarta</artifactId>
     <packaging>jar</packaging>
diff --git a/jakarta/pom.xml b/jakarta/pom.xml
index 1613769aea..e509b8ce2e 100644
--- a/jakarta/pom.xml
+++ b/jakarta/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
     <artifactId>struts2-jakarta</artifactId>
     <packaging>pom</packaging>
diff --git a/jakarta/sitemesh2-jakarta/pom.xml b/jakarta/sitemesh2-jakarta/pom.xml
index 16854fd83f..2ee3b49f47 100644
--- a/jakarta/sitemesh2-jakarta/pom.xml
+++ b/jakarta/sitemesh2-jakarta/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-jakarta</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
     <artifactId>struts2-sitemesh2-jakarta</artifactId>
     <packaging>jar</packaging>
diff --git a/jakarta/velocity-tools-jsp-jakarta/pom.xml b/jakarta/velocity-tools-jsp-jakarta/pom.xml
index 50ec258aea..d029d6744d 100644
--- a/jakarta/velocity-tools-jsp-jakarta/pom.xml
+++ b/jakarta/velocity-tools-jsp-jakarta/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-jakarta</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
     <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
     <packaging>jar</packaging>
diff --git a/jakarta/velocity-tools-view-jakarta/pom.xml b/jakarta/velocity-tools-view-jakarta/pom.xml
index 0d301634c5..15b35f2d92 100644
--- a/jakarta/velocity-tools-view-jakarta/pom.xml
+++ b/jakarta/velocity-tools-view-jakarta/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-jakarta</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
     <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
     <packaging>jar</packaging>
diff --git a/plugins/async/pom.xml b/plugins/async/pom.xml
index b0bce99041..c77202f0a9 100644
--- a/plugins/async/pom.xml
+++ b/plugins/async/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-async-plugin</artifactId>
diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml
index 3b95191871..eb95180bbf 100644
--- a/plugins/bean-validation/pom.xml
+++ b/plugins/bean-validation/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 48a6e65c9d..7247ed3a5d 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-cdi-plugin</artifactId>
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index f863788e4e..fe27db7daf 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-config-browser-plugin</artifactId>
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index b154e11c2c..0cd8c885d0 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-convention-plugin</artifactId>
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index d3e86561e9..aaa332083c 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-jasperreports-plugin</artifactId>
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 7c5476c05c..7c4388cf4e 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-javatemplates-plugin</artifactId>
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 0ec1bb58e0..25764d477d 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-jfreechart-plugin</artifactId>
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 0f8059137d..9dd9c24dae 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-json-plugin</artifactId>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 807500241f..055e37d967 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 2b105d1803..b33507bc61 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-plugins</artifactId>
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index fbcbe3b692..07c5e3d3e2 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-rest-plugin</artifactId>
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index d3edd3bb92..e61d0fafb1 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-sitemesh-plugin</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 05a71747f8..28498f565b 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index 3bee051ef1..5090abf3ad 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-testng-plugin</artifactId>
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index f2989f97e4..8991a3211f 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-tiles-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index d912d7cf3b..83e66d41ed 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-velocity-plugin</artifactId>
diff --git a/plugins/xslt/pom.xml b/plugins/xslt/pom.xml
index daa9ddeb98..2d9e6c0ac0 100644
--- a/plugins/xslt/pom.xml
+++ b/plugins/xslt/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.0.0-M6-SNAPSHOT</version>
+        <version>7.0.0-M6</version>
     </parent>
 
     <artifactId>struts2-xslt-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 3a7a2e5be5..aa11d724d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-parent</artifactId>
-    <version>7.0.0-M6-SNAPSHOT</version>
+    <version>7.0.0-M6</version>
     <packaging>pom</packaging>
     <name>Struts 2</name>
     <url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</developerConnection>
         <url>https://github.com/apache/struts/</url>
-        <tag>HEAD</tag>
+        <tag>STRUTS_7_0_0_M6</tag>
     </scm>
 
     <issueManagement>
@@ -104,7 +104,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.build.outputTimestamp>2024-04-19T19:00:00Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2024-04-20T07:19:37Z</project.build.outputTimestamp>
         <maven.compiler.release>17</maven.compiler.release>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>