diff --git a/pmd-apex-jorje/pom.xml b/pmd-apex-jorje/pom.xml
index efbe99b394..ea8bf78a2c 100644
--- a/pmd-apex-jorje/pom.xml
+++ b/pmd-apex-jorje/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>net.sourceforge.pmd</groupId>
     <artifactId>pmd</artifactId>
-    <version>6.21.0-SNAPSHOT</version>
+    <version>6.21.0</version>
   </parent>
 
   <properties>
diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml
index 3b14a6d072..56bd12a9f9 100644
--- a/pmd-apex/pom.xml
+++ b/pmd-apex/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>net.sourceforge.pmd</groupId>
     <artifactId>pmd</artifactId>
-    <version>6.21.0-SNAPSHOT</version>
+    <version>6.21.0</version>
   </parent>
 
   <properties>
diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml
index cd663e3ca9..8447a7400a 100644
--- a/pmd-core/pom.xml
+++ b/pmd-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml
index c18d506f71..e4e83b975f 100644
--- a/pmd-cpp/pom.xml
+++ b/pmd-cpp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml
index 0d9ca5502f..cbe8f5696f 100644
--- a/pmd-cs/pom.xml
+++ b/pmd-cs/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml
index 789636974e..7bde9fd7a5 100644
--- a/pmd-dart/pom.xml
+++ b/pmd-dart/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
index d6eb5253c5..66916af2ae 100644
--- a/pmd-dist/pom.xml
+++ b/pmd-dist/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-doc/pom.xml b/pmd-doc/pom.xml
index 743900a934..025b130ca4 100644
--- a/pmd-doc/pom.xml
+++ b/pmd-doc/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml
index 0d77c50a07..62e739a30c 100644
--- a/pmd-fortran/pom.xml
+++ b/pmd-fortran/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml
index 309bab3cad..4d6df8a49a 100644
--- a/pmd-go/pom.xml
+++ b/pmd-go/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-groovy/pom.xml b/pmd-groovy/pom.xml
index fdaec463b9..45eefd4d7e 100644
--- a/pmd-groovy/pom.xml
+++ b/pmd-groovy/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index 0e49fe404f..9f867591f4 100644
--- a/pmd-java/pom.xml
+++ b/pmd-java/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-java8/pom.xml b/pmd-java8/pom.xml
index b2ca8fdbac..eefc8b762b 100644
--- a/pmd-java8/pom.xml
+++ b/pmd-java8/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml
index a2df98aeff..bc9b860cde 100644
--- a/pmd-javascript/pom.xml
+++ b/pmd-javascript/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml
index d0dbb6455b..468a5f84b1 100644
--- a/pmd-jsp/pom.xml
+++ b/pmd-jsp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-kotlin/pom.xml b/pmd-kotlin/pom.xml
index 56456228bb..447a3d2938 100644
--- a/pmd-kotlin/pom.xml
+++ b/pmd-kotlin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-lang-test/pom.xml b/pmd-lang-test/pom.xml
index 95daf97026..286c02eedd 100644
--- a/pmd-lang-test/pom.xml
+++ b/pmd-lang-test/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-lua/pom.xml b/pmd-lua/pom.xml
index b226cbe223..2375042899 100644
--- a/pmd-lua/pom.xml
+++ b/pmd-lua/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml
index acd630c733..902d6aafad 100644
--- a/pmd-matlab/pom.xml
+++ b/pmd-matlab/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-modelica/pom.xml b/pmd-modelica/pom.xml
index 30e35bf43b..f0f64f0f8c 100644
--- a/pmd-modelica/pom.xml
+++ b/pmd-modelica/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml
index 8a0680cb10..63fbb89494 100644
--- a/pmd-objectivec/pom.xml
+++ b/pmd-objectivec/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-perl/pom.xml b/pmd-perl/pom.xml
index 94f4436544..dc940b6f74 100644
--- a/pmd-perl/pom.xml
+++ b/pmd-perl/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-php/pom.xml b/pmd-php/pom.xml
index 8e35d3bee0..84e99c4279 100644
--- a/pmd-php/pom.xml
+++ b/pmd-php/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml
index bc2c634a85..7f779d6a84 100644
--- a/pmd-plsql/pom.xml
+++ b/pmd-plsql/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml
index 3e5421a781..b54058410c 100644
--- a/pmd-python/pom.xml
+++ b/pmd-python/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-ruby/pom.xml b/pmd-ruby/pom.xml
index 9761e0c0b5..d5490d5dda 100644
--- a/pmd-ruby/pom.xml
+++ b/pmd-ruby/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <dependencies>
diff --git a/pmd-scala/pom.xml b/pmd-scala/pom.xml
index a78afdbde6..9375068462 100644
--- a/pmd-scala/pom.xml
+++ b/pmd-scala/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-swift/pom.xml b/pmd-swift/pom.xml
index 3b30ccc761..b6e4e6d4a3 100644
--- a/pmd-swift/pom.xml
+++ b/pmd-swift/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-test/pom.xml b/pmd-test/pom.xml
index 5af0ec72a4..f6b3a94e00 100644
--- a/pmd-test/pom.xml
+++ b/pmd-test/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <dependencies>
diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml
index 70218efbc3..5207016364 100644
--- a/pmd-visualforce/pom.xml
+++ b/pmd-visualforce/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml
index 7e1cd301e7..221862cf59 100644
--- a/pmd-vm/pom.xml
+++ b/pmd-vm/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml
index 53b81d8624..efea49111d 100644
--- a/pmd-xml/pom.xml
+++ b/pmd-xml/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.21.0-SNAPSHOT</version>
+        <version>6.21.0</version>
     </parent>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 1aea99b3bd..5c8b6eef68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sourceforge.pmd</groupId>
     <artifactId>pmd</artifactId>
-    <version>6.21.0-SNAPSHOT</version>
+    <version>6.21.0</version>
     <packaging>pom</packaging>
     <name>PMD</name>
 
@@ -55,7 +55,7 @@ Objective-C, Perl, PHP, PLSQL, Python, Ruby, Salesforce.com Apex, Scala, Swift a
         <connection>scm:git:git://github.com/pmd/pmd.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/pmd/pmd.git</developerConnection>
         <url>https://github.com/pmd/pmd</url>
-        <tag>HEAD</tag>
+        <tag>pmd_releases/6.21.0</tag>
     </scm>
     <distributionManagement>
         <snapshotRepository>