diff --git a/CHANGELOG.org b/CHANGELOG.org
index 49021c1..3de5845 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -1,12 +1,32 @@
 * CHANGELOG
 
-** 5.3.0 - 2018-11-11
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+** [5.3.2] - Unreleased
+
+*** Dependencies
+
+    * Bump mockito-core from 2.23.0 to 2.23.4 (#146)
+    * Bump spring-boot.version from 2.1.0.RELEASE to 2.1.1.RELEASE (#149)
+    * Bump checkstyle from 8.14 to 8.15 (#148)
+    * Bump classgraph from 4.2.12 to 4.6.3 (#150)(#151)
+
+** [5.3.1] - 2018-11-17
+
+*** Fixed
+
+    * [tile] use project version for selecting ruleset version (#145)
+
+** [5.3.0] - 2018-11-11
 
 *** Removed
 
     * Disable AbstractClassName
 
-** 5.2.0
+** [5.2.0]
  
    * Disable JavadocMethod
    * Disable Header
@@ -15,7 +35,7 @@
    * Fix typo in UselessSingleCatch
    * Fix typo in UselessSuperCtorCall
 
-** 5.1.1
+** [5.1.1]
 
    * [bug] tile depends on DEV-SNAPSHOT ruleset (#137)
    * Bump mockito-core from 2.22.0 to 2.23.0 (#129)
@@ -24,13 +44,13 @@
    * Bump classgraph from 4.2.8 to 4.2.12 (#132)(#133)
    * Bump spring-boot.version from 2.0.5.RELEASE to 2.0.6.RELEASE (#136)
 
-** 5.1.0
+** [5.1.0]
 
    * [tile] Execute `checkstyle:checkstyle` during the `test` phase
    * [jenkins] Replace Java 9 and 10 steps with a single Java 11 step
    * [travis] Remove Travis CI support
 
-** 5.0.0
+** [5.0.0]
 
    * [BREAKING] [ruleset] Replace `RedundantModifier` with `InterfaceMemberImpliedModifier`
    * [ruleset] Add rule `LambdaParameterName`
@@ -50,11 +70,11 @@
    * [builder] Upgrade `javax-annotation-api` to 1.3.2
    * Add badges to README
 
-** 4.1.1
+** [4.1.1]
 
    * Fix version of `ruleset` used in `tile`
 
-** 4.1.0
+** [4.1.0]
 
    * `EmptyLineSeparator`: disabled
    * Upgrade `tiles-maven-plugin` to 2.11
@@ -63,13 +83,13 @@
    * Upgrade `secntu-checkstyle` to 1.27.0
    * Upgrade `checkstyle` to 8.7 (properly now that it is supported by sevntu)
 
-** 4.0.1
+** [4.0.1]
 
    * Add sourceDirectories to avoid scanning generated sources
    * Upgrade lombok to 1.16.20
    * Upgrade kemitix-maven-tiles to 0.3.0
 
-** 4.0.0
+** [4.0.0]
 
    * Upgrade to `maven-checkstyle-plugin` 3.0.0
    * Change ruleset groupId/artifactId to `net.kemitix.checkstyle/ruleset`
@@ -78,7 +98,7 @@
    * Restore Header and JavadocPackage checks
    * Add missing reasons for disabling checks
 
-** 3.4.0
+** [3.4.0]
 
    * Disable Header check
    * Remove requirement for `@author` in Type Javadoc
@@ -88,7 +108,7 @@
    * Upgrade `checkstyle` to 8.7
    * Upgrade `sevntu-checkstyle` to 1.26.0
 
-** 3.3.0
+** [3.3.0]
 
    * Upgrade spring boot to 1.5.4
    * Upgrade platform to Brussels-SR3
@@ -101,7 +121,7 @@
    * Enable rule: FinalizeImplementation
    * Enable rule: AvoidDefaultSerializableInInnerClass
 
-** 3.2.0
+** [3.2.0]
 
    * Restructure module parent poms
    * Upgrade kemitix-parent to 3.0.0
@@ -111,7 +131,7 @@
    * travis-ci: publish code coverate to codecov
    * Add level 0 Disabled
 
-** 3.1.0
+** [3.1.0]
 
    * Upgrade checkstyle to 7.8
    * Upgrade sevntu to 1.24.0
@@ -121,65 +141,65 @@
    * Add Wercker CI
    * Add Shippable CI
 
-** 3.0.1
+** [3.0.1]
 
    * Add travis deploy to nexus
 
-** 3.0.0
+** [3.0.0]
 
    * BREAKING: Replace goals for plugin: use 'check' and configuration/level (see README.md)
    * Rules are properly listed in README.md alphabetically
    * Add unit tests for plugin
 
-** 2.3.0
+** [2.3.0]
 
    * Add org.immutables:value compatibility for level 5-complexity (disable ForbidWildcardAsReturn)
    * Upgrade checkstyle to 7.6.1
 
-** 2.2.0
+** [2.2.0]
 
    * Upgrade sevntu to 1.23.1
    * Upgrade checkstyle to 7.6
    * Detect sync conflicts
 
-** 2.1.3
+** [2.1.3]
 
    * Change required pom dependency
    * Only apply checks to code in: src/main/java
    * Replace parent pom with kemitix-parent:2.4.0
    * Remove dependency on kemitix-checkstyle-ruleset-maven-plugin for builder module
 
-** 2.1.2
+** [2.1.2]
 
    * Use the plugin version to find plugin's own pom
 
-** 2.1.1
+** [2.1.1]
 
    * Load plugin dependency versions from the plugin's own pom
    * Cross-platform build
 
-** 2.1.0
+** [2.1.0]
 
    * Upgrade dependencies, including checkstyle to 7.5.1
 
-** 2.0.3
+** [2.0.3]
 
    * plugin-sample: Add distributionManagement
 
-** 2.0.2
+** [2.0.2]
 
    * Add distributionManagement to parent
 
-** 2.0.1
+** [2.0.1]
 
    * ruleset: restore properties used in release profile
 
-** 2.0.0
+** [2.0.0]
 
    * Split ruleset into 5 levels
    * Provide plugin to simplify use
 
-** 1.0.0
+** [1.0.0]
 
    * LineLength: allow lines up to 120 characters
    * AtclauseOrder: use order forced by IntelliJ
@@ -199,7 +219,7 @@
    * Remove checks: RedundantImport, ForbidThrowAnonymousExceptions, AvoidConditionInversionCheck and FinalLocalVariable
    * Added checks: AvoidInlineConditionals, EqualsAvoidNull, FinalLocalVariable, Header, IllegalToken, InterfaceTypeParameterName, MethodTypeParameterName, NoFinalizer, NoLineWrap, PackageAnnotation, RequireThis, SuppressWarnings, Translation, UncommentedMain and UniqueProperties
 
-** 0.1.0
+** [0.1.0]
 
    * Initial Release
 
diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index 832cdd2..f9f0a40 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -1,6 +1,5 @@
 final String publicRepo = 'https://github.com/kemitix/'
 final String mvn = "mvn --batch-mode --update-snapshots --errors"
-final dependenciesSupportJDK = 10
 
 pipeline {
     agent any
@@ -19,12 +18,6 @@ pipeline {
                 withMaven(maven: 'maven', jdk: 'JDK 1.8') {
                     // Code Coverage to Jenkins
                     jacoco exclusionPattern: '**/*{Test|IT|Main|Application|Immutable}.class'
-                    // Code Coverage to Codacy
-                    sh "${mvn} -pl builder jacoco:report com.gavinmogan:codacy-maven-plugin:coverage " +
-                            "-DcoverageReportFile=target/site/jacoco/jacoco.xml " +
-                            "-DprojectToken=`$JENKINS_HOME/codacy/token` " +
-                            "-DapiToken=`$JENKINS_HOME/codacy/apitoken` " +
-                            "-Dcommit=`git rev-parse HEAD`"
                 }
             }
         }
@@ -46,16 +39,6 @@ pipeline {
                 }
             }
         }
-        stage('SonarQube (published)') {
-            when { expression { isPublished(publicRepo) } }
-            steps {
-                withSonarQubeEnv('sonarqube') {
-                    withMaven(maven: 'maven', jdk: 'JDK 1.8') {
-                        sh "${mvn} org.sonarsource.scanner.maven:sonar-maven-plugin:3.4.0.905:sonar"
-                    }
-                }
-            }
-        }
         stage('Deploy (published release branch)') {
             when {
                 expression {
@@ -71,13 +54,19 @@ pipeline {
             }
         }
         stage('Build Java 11') {
-            when { expression { dependenciesSupportJDK >= 10 } }
             steps {
                 withMaven(maven: 'maven', jdk: 'JDK 11') {
                     sh "${mvn} clean verify -Djava.version=11"
                 }
             }
         }
+        stage('Build Java 12') {
+            steps {
+                withMaven(maven: 'maven', jdk: 'JDK 12') {
+                    sh "${mvn} clean verify -Djava.version=12"
+                }
+            }
+        }
     }
 }
 
diff --git a/README.md b/README.md
index 84d3ccf..f50e9a0 100644
--- a/README.md
+++ b/README.md
@@ -5,18 +5,6 @@ Provides an extensive Checkstyle ruleset for use with Checkstyle, together with
  ![Sonatype Nexus (Release)](https://img.shields.io/nexus/r/https/oss.sonatype.org/net.kemitix.checkstyle/ruleset.svg?style=for-the-badge)
  ![Maven Central](https://img.shields.io/maven-central/v/net.kemitix.checkstyle/ruleset.svg?style=for-the-badge)
 
- ![Coverage](https://img.shields.io/sonar/https/sonarcloud.io/net.kemitix.checkstyle:builder/coverage.svg?style=for-the-badge#.svg)
- ![Tech Debt](https://img.shields.io/sonar/https/sonarcloud.io/net.kemitix.checkstyle:builder/tech_debt.svg?style=for-the-badge#.svg)
- ![SQALE Rating](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=sqale_rating#.svg)
- ![Alert Status](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=alert_status#.svg)
- ![Reliability](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=reliability_rating#.svg)
- ![Security](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=security_rating#.svg)
- ![SQALE Index](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=sqale_index#.svg)
- ![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=vulnerabilities#.svg)
- ![Bugs](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=bugs#.svg)
- ![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=code_smells#.svg)
- ![NCLOC](https://sonarcloud.io/api/project_badges/measure?project=net.kemitix.checkstyle:kemitix-checkstyle-ruleset&metric=ncloc#.svg)
-
  ![Codacy](https://img.shields.io/codacy/grade/f1208289122e48daa89c46671293b3c2.svg?style=for-the-badge)
  ![JPeek](http://i.jpeek.org/net.kemitix.checkstyle/ruleset/badge.svg)
 
@@ -2729,4 +2717,4 @@ allow use of non-bean property-like naming
 
 Can't handle private methods called by reflection, which may cause issues with Spring and other DI frameworks.
 
-[Effective Java]: http://amzn.to/2aSz6GE
\ No newline at end of file
+[Effective Java]: http://amzn.to/2aSz6GE