diff --git a/.drone.yml b/.drone.yml
index 71600ea..0195d77 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,25 +2,38 @@ kind: pipeline
 name: default
 
 steps:
-  - name: test-online
+  - name: compile
     image: maven:3-jdk-11
-    environment:
-      VAULT_VERSION: 1.4.0
     commands:
-      - curl -o vault_1.4.0_linux_amd64.zip https://releases.hashicorp.com/vault/1.4.0/vault_1.4.0_linux_amd64.zip
-      - curl -s https://releases.hashicorp.com/vault/1.4.0/vault_1.4.0_SHA256SUMS | grep linux_amd64 | sha256sum -c
-      - unzip vault_1.4.0_linux_amd64.zip
-      - rm vault_1.4.0_linux_amd64.zip
-      - mv vault /bin/
-      - mvn clean test
+      - mvn clean compile
     when:
       branch:
         - master
-  - name: test-offline
+        - develop
+        - feature/*
+        - fix/*
+        - release/*
+  - name: unit-tests
     image: maven:3-jdk-11
     commands:
-      - mvn clean test -P offline-tests
+      - mvn test -P offline-tests
     when:
       branch:
         - develop
         - feature/*
+        - fix/*
+  - name: unit-integration-tests
+    image: maven:3-jdk-11
+    environment:
+      VAULT_VERSION: 1.4.0
+    commands:
+      - curl -s -o vault_1.4.0_linux_amd64.zip https://releases.hashicorp.com/vault/1.4.0/vault_1.4.0_linux_amd64.zip
+      - curl -s https://releases.hashicorp.com/vault/1.4.0/vault_1.4.0_SHA256SUMS | grep linux_amd64 | sha256sum -c
+      - unzip vault_1.4.0_linux_amd64.zip
+      - rm vault_1.4.0_linux_amd64.zip
+      - mv vault /bin/
+      - mvn test
+    when:
+      branch:
+        - master
+        - release/*
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 74f5d22..74536ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,16 @@ addons:
     organization: "stklcode-github"
     token:
       secure: "sM9OfX5jW764pn9cb2LSXArnXucKMws+eGeg5NnZxHRcGYt4hpBKLSregBSsBNzUoWVj0zNzPCpnh+UQvgxQzUerOqwEdjTBpy3SNPaxSn7UpoSg+Wz3aUmL9ugmx01b51/wMG4UCHEwTZt2tpgTPVtw8K6uSO78e0dSICCBHDnRcdQwOjMEQHIJJ/qHVRwuy/MzLCAP3W1JPZlsphZg9QsFyhB4hW97dE90joZezfocQIv2xI/r6k+BLz0pY6MxYCul0RiDumaiaej0CPvEJI/uSu//BAQjUdHw+mQgnKUYIbrn2ONOviwNfwdr94JyoZEN2B6zASUmNLjPf4AbIojDeyS+CrpQpm17EVm/Qk/Ds+Xra4PPPIcsZhiWzV0KoDUz9xLfXuRJ526VT5tDPiaeI7oETf0+8l+JIS1b399FyqHi7smzjpvC6GuKflQrbuHK4MuKzDh7WTHiqokGG4SS0wOQIaaHB3dfdwwQzPh6IM24e8CETxh3DjMeqUTU4DWmv5po55jZ934TtxVQvVN78bTG9O0zS9u+JmRY04OZ+OaXuFam6MfMUFQi0EPZzdGul/oWSibGUu3bNfVEBp60CnJwYNM/dKG6U7pJthLHvSwiQFOdKzHZ+l1jZJ4gPaXaIGqpwqVGr28ntqA/El1rytPixr2driE6bYMt5jw="
+stages:
+  - Compile
+  - Test
+  - Analysis
 env:
   - PATH=$PATH:. VAULT_VERSION=1.4.0
 before_script:
   - |
-    if [ "$TRAVIS_BRANCH" = "master" ]; then
-      wget https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip
+    if [[ "$TRAVIS_BRANCH" =~ ^master|(release\/.+)$ ]]; then
+      wget -q https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip
       wget -q -O - https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_SHA256SUMS | grep linux_amd64 | sha256sum -c
       unzip vault_${VAULT_VERSION}_linux_amd64.zip
       rm vault_${VAULT_VERSION}_linux_amd64.zip
@@ -21,13 +25,26 @@ cache:
   directories:
     - '$HOME/.m2/repository'
     - '$HOME/.sonar/cache'
-script:
-  - |
-    if [ "$TRAVIS_BRANCH" = "master" ]; then
-      mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar
-    else
-      mvn clean test -P offline-tests
-    fi
+jobs:
+  include:
+    - stage: Compile
+      name: Compile
+      script:
+        - mvn clean compile
+    - stage: Test
+      name: Unit Tests
+      if: NOT branch =~ ^master|(release/.+)$
+      script:
+        - mvn test -P offline-tests
+    - name: Unit and Integration Tests
+      if: branch =~ ^master|(release/.+)$
+      script:
+        - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package
+    - stage: Analysis
+      if: branch = master
+      script:
+        - mvn sonar:sonar
+
 notifications:
   slack:
     secure: "YyE5GePOLkCVTtCy8j507BRmQrtrWhtvmUt4kY0Z2/ptf0LzfuDEJQ4ZbCxO5ri5IDJrrvyPAedjft818+bMzdFfxvi1oviIL+LZNhyev8gfeIBF/U2pvSLGKCRX4g4aZ6NKN3Untjdm8lmiVTltOyZ59JizQVwXzAl3LiOpnJugyBqbhOx4EIqBzwW3gaYAofMqY2LczW5W/M+99HJCst8Mb8H06GstCPEHCizAq7VRaUS68PstlxQMV0Q6bsSYMLFbLWmhuXs96WHqOrT+nNsl07ikr3N8c4HafhFutt2Jyc1+8gXO417+eSvVM0iBpHGwTmfGFfCqx/4Pf62DTJuvh8dR4fLgLDiqEeDrBEcRRDOs9cvXVOO22NN1HuBBJY8VRiFcwNAvuVMXCtnC+1RJRAZB2zubsANiFe+ygk/ywj37cVXY+NpqlBwcSph6jPHo2hD6cIl2rTWn1EnZH519Rh38xTSv6MRzAO9kWNVrAlX+UtvYS8Sk7Owrc0tET9Lc4zj6aI5tsA1wYbN3Jk6EbMhsF6K/XF2npt2qg09pxkj8wmxoUoR6/rGuSv55aSxTdLDmH+en4ahEm3uc4h1lYoVCk0yrZoTAas3zS4WpBCKnl+mweuKNxaejyy0Wv6NR9ZCTaS3yFgibNOjvDpxZxTAPdNBL7hn+k4LwgN4="