diff --git a/pmd-apex-jorje/pom.xml b/pmd-apex-jorje/pom.xml
index 3db62c430f..45d0b90c0b 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.36.0-SNAPSHOT</version>
+    <version>6.36.0</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml
index f6bb0eeac3..1dcd842777 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml
index 9022d30e9a..595dd05abe 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml
index bb986c8caa..f9bbf03e0d 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml
index 28fe50ec59..c48acfb960 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml
index e9d2d117ef..ba587d6c19 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
index 016ea850bc..3880caa3ef 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-doc/pom.xml b/pmd-doc/pom.xml
index 940ae7179d..1e8a7aa94a 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml
index df63bdb659..c39e81f20b 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml
index 109111b386..5d91a6bcad 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-groovy/pom.xml b/pmd-groovy/pom.xml
index c08a0381e9..b6bdf8ad0e 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index 06f7eed7f4..f908ca075e 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-java8/pom.xml b/pmd-java8/pom.xml
index 71af77c862..faef813fbb 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml
index ac15862ec9..fa8e1f0336 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml
index e0e0880783..1b2f1e6886 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-kotlin/pom.xml b/pmd-kotlin/pom.xml
index 8423900ca1..e8fd80c027 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-lang-test/pom.xml b/pmd-lang-test/pom.xml
index 0b9371d870..10520d7caf 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-lua/pom.xml b/pmd-lua/pom.xml
index f9b83b881e..c017154235 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml
index 6f1075e6a5..27c54ced31 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-modelica/pom.xml b/pmd-modelica/pom.xml
index eda8e5432b..78851ff2c6 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml
index 95cf511f30..032d33400f 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-perl/pom.xml b/pmd-perl/pom.xml
index 3591164b6e..9d81e27b47 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-php/pom.xml b/pmd-php/pom.xml
index 430cb4400b..3faede0bd2 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml
index 5e128b5c21..032fbde4ca 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml
index 871a48975b..6a3935c1fd 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-ruby/pom.xml b/pmd-ruby/pom.xml
index e19a9aafcd..633c2a209f 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-scala-modules/pmd-scala-common/pom.xml b/pmd-scala-modules/pmd-scala-common/pom.xml
index f039843c9b..168c282bed 100644
--- a/pmd-scala-modules/pmd-scala-common/pom.xml
+++ b/pmd-scala-modules/pmd-scala-common/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/pmd-scala-modules/pmd-scala_2.12/pom.xml b/pmd-scala-modules/pmd-scala_2.12/pom.xml
index f7cfd7366c..c9fbe333ce 100644
--- a/pmd-scala-modules/pmd-scala_2.12/pom.xml
+++ b/pmd-scala-modules/pmd-scala_2.12/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd-scala-common</artifactId>
-        <version>6.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../pmd-scala-common</relativePath>
     </parent>
 
diff --git a/pmd-scala-modules/pmd-scala_2.13/pom.xml b/pmd-scala-modules/pmd-scala_2.13/pom.xml
index 4ae5216b9f..ae457e860f 100644
--- a/pmd-scala-modules/pmd-scala_2.13/pom.xml
+++ b/pmd-scala-modules/pmd-scala_2.13/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd-scala-common</artifactId>
-        <version>6.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../pmd-scala-common</relativePath>
     </parent>
 
diff --git a/pmd-scala/pom.xml b/pmd-scala/pom.xml
index 5df05e1d6b..421afc567e 100644
--- a/pmd-scala/pom.xml
+++ b/pmd-scala/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-swift/pom.xml b/pmd-swift/pom.xml
index df86bb1da1..21d4e134d2 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-test/pom.xml b/pmd-test/pom.xml
index 59840b918d..6130cb88e4 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml
index 5fb9307ffb..a973955c33 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml
index 235bc9e203..8e870fa440 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml
index dcb1c651bd..b2aa776fd2 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.36.0-SNAPSHOT</version>
+        <version>6.36.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index ce2a6ef952..d07dc26f42 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.36.0-SNAPSHOT</version>
+    <version>6.36.0</version>
     <packaging>pom</packaging>
     <name>PMD</name>
 
@@ -55,7 +55,7 @@
         <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.36.0</tag>
     </scm>
     <distributionManagement>
         <snapshotRepository>
@@ -76,7 +76,7 @@
     </issueManagement>
 
     <properties>
-        <project.build.outputTimestamp>2021-05-29T05:24:47Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2021-06-26T08:12:22Z</project.build.outputTimestamp>
 
         <java.version>7</java.version>