diff --git a/pmd-apex-jorje/pom.xml b/pmd-apex-jorje/pom.xml
index f5790c5b76..7826b2f6fa 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.20.0</version>
+    <version>6.21.0-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml
index 32d2b2e69a..31eb9be9f0 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.20.0</version>
+    <version>6.21.0-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml
index aedb550a67..cd663e3ca9 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml
index 7e24daf66f..c18d506f71 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml
index 6ff8ef9156..0d9ca5502f 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml
index 25f10551d6..789636974e 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
index 53e99fc0d3..41a671e162 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/pmd-doc/pom.xml b/pmd-doc/pom.xml
index 984d1edd10..743900a934 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml
index 8aa92e4110..0d77c50a07 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml
index 366ce07ccd..309bab3cad 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-groovy/pom.xml b/pmd-groovy/pom.xml
index b8f8db6279..fdaec463b9 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index a499a54cdc..55ec0d612b 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-java8/pom.xml b/pmd-java8/pom.xml
index 66d79318a9..b2ca8fdbac 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml
index 1070eae059..28115957d3 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml
index bdd3a07eea..a0052f7229 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-kotlin/pom.xml b/pmd-kotlin/pom.xml
index 39eb63c8bb..56456228bb 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-lang-test/pom.xml b/pmd-lang-test/pom.xml
index 6233c1abc7..95daf97026 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-lua/pom.xml b/pmd-lua/pom.xml
index 798d40f54c..b226cbe223 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml
index 8ce9163bee..acd630c733 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml
index dd85fc595d..8a0680cb10 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-perl/pom.xml b/pmd-perl/pom.xml
index b9208bec3b..94f4436544 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-php/pom.xml b/pmd-php/pom.xml
index 65466dfc97..8e35d3bee0 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml
index 882cea92bb..7930e4e27d 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml
index 52c6e6dddc..3e5421a781 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-ruby/pom.xml b/pmd-ruby/pom.xml
index 29113ae651..9761e0c0b5 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/pmd-scala/pom.xml b/pmd-scala/pom.xml
index 5515351b98..a78afdbde6 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/pmd-swift/pom.xml b/pmd-swift/pom.xml
index 140eabc295..3b30ccc761 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-test/pom.xml b/pmd-test/pom.xml
index e186c6540f..5af0ec72a4 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml
index 0543875821..d4b0d3dd42 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml
index 81395435df..7e1cd301e7 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml
index ebe4398245..f9883ffe40 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.20.0</version>
+        <version>6.21.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pom.xml b/pom.xml
index a1ea14bccc..cb53bf2748 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.20.0</version>
+    <version>6.21.0-SNAPSHOT</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>pmd_releases/6.20.0</tag>
+        <tag>HEAD</tag>
     </scm>
     <distributionManagement>
         <snapshotRepository>