diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index 7fc6970..776fd5d 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -1,31 +1,29 @@
+final String publicRepo = 'https://github.com/kemitix/'
 final String mvn = "mvn --batch-mode --update-snapshots --errors"
 final dependenciesSupportJDK = 9
 
 pipeline {
     agent any
     stages {
-        stage('release != SNAPSHOT') {
-            // checks that the pom version is not a SNAPSHOT when the current branch is a release
-            when {
-                expression {
-                    (branchStartsWith('release/')) &&
-                            (readMavenPom(file: 'pom.xml').version).contains("SNAPSHOT")
-                }
-            }
-            steps {
-                error("Build failed because SNAPSHOT version: [" + env.GIT_BRANCH + "]")
-            }
-        }
         stage('Build & Test') {
             steps {
                 withMaven(maven: 'maven', jdk: 'JDK 1.8') {
                     sh "${mvn} clean compile checkstyle:checkstyle pmd:pmd test"
+                    // Code Coverage to Codacy
+                    sh "${mvn} 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`"
+                    // Code Coverage to Jenkins
                     jacoco exclusionPattern: '**/*{Test|IT|Main|Application|Immutable}.class'
+                    // PMD to Jenkins
                     pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '', unHealthy: ''
-                    step([$class   : 'hudson.plugins.checkstyle.CheckStylePublisher',
-                          pattern  : '**/target/checkstyle-result.xml',
-                          healthy  : '20',
-                          unHealthy: '100'])
+                    // Checkstyle to Jenkins
+                    step([$class: 'hudson.plugins.checkstyle.CheckStylePublisher',
+                          pattern: '**/target/checkstyle-result.xml',
+                          healthy:'20',
+                          unHealthy:'100'])
                 }
             }
         }
@@ -36,8 +34,8 @@ pipeline {
                 }
             }
         }
-        stage('SonarQube (gitlab only)') {
-            when { expression { isPublished() } }
+        stage('SonarQube (published)') {
+            when { expression { isPublished(publicRepo) } }
             steps {
                 withSonarQubeEnv('sonarqube') {
                     withMaven(maven: 'maven', jdk: 'JDK 1.8') {
@@ -46,15 +44,17 @@ pipeline {
                 }
             }
         }
-        stage('Deploy (release on gitlab)') {
+        stage('Deploy (published release branch)') {
             when {
                 expression {
-                    (branchStartsWith('release/') && isPublished())
+                    (isReleaseBranch() &&
+                            isPublished(publicRepo) &&
+                            notSnapshot())
                 }
             }
             steps {
                 withMaven(maven: 'maven', jdk: 'JDK 1.8') {
-                    sh "${mvn} deploy --activate-profiles release -DskipTests=true -Dpitest.skip=true"
+                    sh "${mvn} --activate-profiles release deploy"
                 }
             }
         }
@@ -77,14 +77,22 @@ pipeline {
     }
 }
 
-private boolean branchStartsWith(String branchName) {
+private boolean isReleaseBranch() {
+    return branchStartsWith('release/')
+}
+
+private boolean branchStartsWith(final String branchName) {
     startsWith(env.GIT_BRANCH, branchName)
 }
 
-private boolean isPublished() {
-    startsWith(env.GIT_URL, 'https://')
+private boolean isPublished(final String repo) {
+    startsWith(env.GIT_URL, repo)
 }
 
-private boolean startsWith(String value, String match) {
+private static boolean startsWith(final String value, final String match) {
     value != null && value.startsWith(match)
 }
+
+private boolean notSnapshot() {
+    return !(readMavenPom(file: 'pom.xml').version).contains("SNAPSHOT")
+}