diff --git a/bom/pom.xml b/bom/pom.xml
index 97321181..255ef711 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,12 +10,12 @@
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
         <version>47</version>
-        <relativePath/>
+        <relativePath />
     </parent>
 
     <groupId>org.jboss.mod_cluster</groupId>
     <artifactId>mod_cluster-bom</artifactId>
-    <version>2.1.0.Final-SNAPSHOT</version>
+    <version>2.1.0.Final</version>
     <packaging>pom</packaging>
 
     <name>mod_cluster: BOM</name>
@@ -54,4 +54,8 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+  <scm>
+    <tag>2.1.0.Final</tag>
+  </scm>
 </project>
diff --git a/container/pom.xml b/container/pom.xml
index c7c9f1e1..191e637b 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>mod_cluster-parent</artifactId>
         <groupId>org.jboss.mod_cluster</groupId>
-        <version>2.1.0.Final-SNAPSHOT</version>
+        <version>2.1.0.Final</version>
     </parent>
     <artifactId>mod_cluster-container</artifactId>
     <name>mod_cluster: Container (parent)</name>
diff --git a/container/spi/pom.xml b/container/spi/pom.xml
index 45f4fae6..5b1a5ffc 100644
--- a/container/spi/pom.xml
+++ b/container/spi/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>mod_cluster-container</artifactId>
         <groupId>org.jboss.mod_cluster</groupId>
-        <version>2.1.0.Final-SNAPSHOT</version>
+        <version>2.1.0.Final</version>
     </parent>
     <artifactId>mod_cluster-container-spi</artifactId>
     <name>mod_cluster: Container SPI</name>
diff --git a/container/tomcat-10.1/pom.xml b/container/tomcat-10.1/pom.xml
index 347b3aff..98fe0add 100644
--- a/container/tomcat-10.1/pom.xml
+++ b/container/tomcat-10.1/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.jboss.mod_cluster</groupId>
         <artifactId>mod_cluster-container</artifactId>
-        <version>2.1.0.Final-SNAPSHOT</version>
+        <version>2.1.0.Final</version>
     </parent>
     <artifactId>mod_cluster-container-tomcat-10.1</artifactId>
     <name>mod_cluster: Container - Tomcat 10.1</name>
diff --git a/container/tomcat-11.0/pom.xml b/container/tomcat-11.0/pom.xml
index da67f344..eebb4500 100644
--- a/container/tomcat-11.0/pom.xml
+++ b/container/tomcat-11.0/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.jboss.mod_cluster</groupId>
         <artifactId>mod_cluster-container</artifactId>
-        <version>2.1.0.Final-SNAPSHOT</version>
+        <version>2.1.0.Final</version>
     </parent>
     <artifactId>mod_cluster-container-tomcat-11.0</artifactId>
     <name>mod_cluster: Container - Tomcat 11.0</name>
diff --git a/container/tomcat-9.0/pom.xml b/container/tomcat-9.0/pom.xml
index 062ad673..3fe58a3c 100644
--- a/container/tomcat-9.0/pom.xml
+++ b/container/tomcat-9.0/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.jboss.mod_cluster</groupId>
         <artifactId>mod_cluster-container</artifactId>
-        <version>2.1.0.Final-SNAPSHOT</version>
+        <version>2.1.0.Final</version>
     </parent>
     <artifactId>mod_cluster-container-tomcat-9.0</artifactId>
     <name>mod_cluster: Container - Tomcat 9.0</name>
diff --git a/core/pom.xml b/core/pom.xml
index d3f0edde..ab0a3de8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.jboss.mod_cluster</groupId>
         <artifactId>mod_cluster-parent</artifactId>
-        <version>2.1.0.Final-SNAPSHOT</version>
+        <version>2.1.0.Final</version>
     </parent>
     <artifactId>mod_cluster-core</artifactId>
     <name>mod_cluster: Core</name>
diff --git a/dist/pom.xml b/dist/pom.xml
index f6681bee..535e9f94 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.jboss.mod_cluster</groupId>
         <artifactId>mod_cluster-parent</artifactId>
-        <version>2.1.0.Final-SNAPSHOT</version>
+        <version>2.1.0.Final</version>
     </parent>
 
     <artifactId>mod_cluster-distribution</artifactId>
diff --git a/load-spi/pom.xml b/load-spi/pom.xml
index d1148f5d..f98e939f 100644
--- a/load-spi/pom.xml
+++ b/load-spi/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.jboss.mod_cluster</groupId>
         <artifactId>mod_cluster-parent</artifactId>
-        <version>2.1.0.Final-SNAPSHOT</version>
+        <version>2.1.0.Final</version>
     </parent>
 
     <artifactId>mod_cluster-load-spi</artifactId>
diff --git a/pom.xml b/pom.xml
index 82398d6d..ddd5e8f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.jboss.mod_cluster</groupId>
         <artifactId>mod_cluster-bom</artifactId>
-        <version>2.1.0.Final-SNAPSHOT</version>
+        <version>2.1.0.Final</version>
         <relativePath>bom</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
         <connection>scm:git:git@github.com:modcluster/mod_cluster.git</connection>
         <developerConnection>scm:git:git@github.com:modcluster/mod_cluster.git</developerConnection>
         <url>https://github.com/modcluster/mod_cluster</url>
-        <tag>HEAD</tag>
+        <tag>2.1.0.Final</tag>
     </scm>
 
     <modules>
@@ -238,7 +238,7 @@
                         <failsOnError>true</failsOnError>
                         <includeTestSourceDirectory>true</includeTestSourceDirectory>
                         <excludes>**/*$logger.java,**/*$bundle.java</excludes>
-                        <useFile/>
+                        <useFile />
                     </configuration>
                 </plugin>
                 <plugin>