diff --git a/pmd-apex-jorje/pom.xml b/pmd-apex-jorje/pom.xml
index 2215a9b09e..926f343aca 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.17.0</version>
+    <version>6.18.0-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml
index d3276ac3e3..e93f196b8f 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.17.0</version>
+    <version>6.18.0-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml
index db0d54f103..68c9df4625 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml
index 881088367d..1470e1a698 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml
index 2860fb9fcd..aeb904f919 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml
index f82af30a19..5b9c96f0e7 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
index 9cc87433c2..15e1d74bfa 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/pmd-doc/pom.xml b/pmd-doc/pom.xml
index 14fc649b4b..2a351f112e 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml
index 2cbbe08807..151c1b61ac 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml
index 277f00c79b..9c9c0316be 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-groovy/pom.xml b/pmd-groovy/pom.xml
index 29a7aff926..ce66110735 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index a7fc6ca904..2479508fbc 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-java8/pom.xml b/pmd-java8/pom.xml
index 7c6c4d4d87..1cc7adb758 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml
index 7e32369898..3e8893f007 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml
index 1961fe3cea..c5088a0b8a 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-kotlin/pom.xml b/pmd-kotlin/pom.xml
index 725148b0d8..a29eba4f87 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-lang-test/pom.xml b/pmd-lang-test/pom.xml
index d3e9a3d56e..c1a03ab2c7 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-lua/pom.xml b/pmd-lua/pom.xml
index c0e3475992..d5d31e9a77 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml
index 6a7ac31771..2b2caf0b61 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml
index 86d79a5793..0355d93afa 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-perl/pom.xml b/pmd-perl/pom.xml
index cfeddcd946..5918ef27c6 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-php/pom.xml b/pmd-php/pom.xml
index 974e51042f..46596427b8 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml
index 693519779f..9f6ded833c 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml
index c7e5908b93..066e1c1ac5 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-ruby/pom.xml b/pmd-ruby/pom.xml
index a93530c851..40c08285dd 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/pmd-scala/pom.xml b/pmd-scala/pom.xml
index 36e897a948..5b647f0191 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/pmd-swift/pom.xml b/pmd-swift/pom.xml
index a7d2fd39b4..5d85201840 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-test/pom.xml b/pmd-test/pom.xml
index 4fb36871f9..5118662809 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml
index e5a5f84a26..a87ccb0b6b 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml
index 05d1c42e07..c09cd94bd8 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml
index b6b4600055..b4d4d1a887 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.17.0</version>
+        <version>6.18.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pom.xml b/pom.xml
index c344a81a25..7ec756ec8e 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.17.0</version>
+    <version>6.18.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>PMD</name>
 
@@ -234,7 +234,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
         <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.17.0</tag>
+        <tag>HEAD</tag>
     </scm>
     <distributionManagement>
         <snapshotRepository>