diff --git a/.travis.yml b/.travis.yml
index 1da57d4..7c31c4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,53 @@
 language: java
 
 jdk:
-  - openjdk8
+  - openjdk17
+
+# Need a full git clone in order to be able to tag the release
+git:
+  clone: false
+
+install:
+  - git clone https://github.com/$TRAVIS_REPO_SLUG.git $TRAVIS_REPO_SLUG
+  - cd $TRAVIS_REPO_SLUG
+  - git checkout $TRAVIS_BRANCH
+  - POM_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec | sed -e 's/-SNAPSHOT//')
+  - openssl aes-256-cbc -K $encrypted_044baa266d1a_key -iv $encrypted_044baa266d1a_iv -in .travis/gpg.asc.enc -out .travis/gpg.asc -d
+  - gpg --fast-import .travis/gpg.asc
+
+env:
+  global:
+    # Environment variables referenced in .travis/maven-settings.xml. To encrypt and escape values correctly, run the following
+    # command and enter ENV_VAR=value when prompted:
+    # read -r && travis encrypt "$(printf %q "$REPLY")"
+    - secure: P2wr7U/GoEXXhQ7jZe3I+nrxAuUTjvkP0MZ63v5Oz+JBnfGyEux+cXHsKSEO9jSyNcewibzjwyoX1Qb/hJ7VrxsV0cA3DT6rUCKkOGyb1SoC/rkisEJEQuYGTZYtSPMQ0agBWSR/Pyw5M3M6IBQDZ4lQMWMHnhkQDNoTi0TvprSRjLXI5novQx1dFUU3VyTmc9dovNrjoFWsxCn1DeNYpfZfFBXvK0lHdZFyMfQKNy+Or9Bvb/K+HFmWP0xvUCZz2/ZEAoXEKx4rfR7ZRfFIxN/x4DmqpS1ReFVH6ASsO+CwQuwVPXnX7HQxQllm7FrImxZjqap4CfTj9ce3vUQP4pVK82il6IVJIMfQO+YYhMDfC6IwrQLHuED5EWcuX6jIOcNuNYXzMiBzxGv8+fSt4SLnGMCe6QIOmh0OuBFutAI/eH2E4yNi4KPnBHwCn9+dcMjw7UlOa/c+PBmcSa4STrC5hUR8DlMjyYPNwaZRFROLY2Ezz0cGQd42BQkAnTc9tTDCpyBAaU8pJlh7qZEr+exLbpaceK53nKesyIftnw72zPGCTffwy4qPAQmTxE/ifM0wRNbhsytLq3ewNZaNb6/tdm7WpEnx5nCG4DvgsqCaD+r+SogETInZ3ICDqnATjYDwUaDLHU0XNGtSAZSt1BwjH2YgsAMxrO6Qp+kIfok=
+    - secure: j/yy67LPHCuS5CqkDtcJKwtR7uD1eMo3arLZKMjDpwth2+JzFDqQNu3Ai2vd7zMrVANJxjROV8APxLRp+xB4fKLW7WDCjuI+qce74CqwwA3ViN25JYRJt7y8qXy3smNpjPdFzhM5HDRSA40Ju9UAaijRUotWQWd+kgneu+Z9X2kdZHCUcXoSZMCnNZQUGvPsmW+2YzOgyA/KlZ5g99dyJCte9sxjJx+swc4mtemxs7LBBeN+CG9uHMYex72AVq8VKGwYQQJckP7PsW8/CbdSBe+gG1G9x96mpYjRRa/Y/cR14wS7InYVS3JyRtRqwqHtwrnZs6Y3unVPbseD72SdAswNmxIC8VhisKFlR5+ZBWEUj7R9RCOMjaaSMtaRKVCp8zeFFiplfazXzMO2nEZ0vIbetwTToHEf38AAIYyKJlkGWxIbATVku6R7lKB9KwFpMcgnGUsiQIKlJR6LA9t/v4jkDyqABFAT7HdTDKSBL3PdiD6jidRI3MB8Pycxs/epAUIWbB0NyGl3fxJ6CrT7ZyiVOAo8EuWq+Z4bOF6rEtH+3oXlC/VHybkOYAH2+6R0uKDiDRjmxvZMFqFafYjRbnfRWUjtPERDVeRrhgVsTW3JtF/cWwJyv9FQfUbyDBVSlN0RWswX7MrEvMY6JkgLDZjhoaWF3gYtCv4sS5drxeI=
+    - secure: A6vBxO82Q2mu2p/cRy+4LAjwxxMBf2fjjNBUl71QMfAVVQm2iJXpqfy7nmvnbFtiw+FI6aWBITuLLAMtMVqzqZgj6EjzNffbYkBS7rzAeBJwrLGl1YxnCJCUeGHrdlcQndcMYVUtX1fsxPwra9bsLYJkYltG+w4GWCkfUGRZYWwvGISEumMqu2srf8oe5+ke576dSqmrUqTPR+a3GFuY9jbGI+BOkE5ogAJOls1BpvLebTFTT21mx87TNQzyGS9OnYms2zSOPWfTHd6kwayLHdabN1f1rmxSQOA4wWH8Pi3En+QBWFG7SRSgJRI4SkWqggxvM8/QUFboA5x7QbX1H26MB14hZamuA14KGB4F6j0c1WyqCGXO+cjQo/aHJdbs6KXnkpPgtk+K9BgoyuIMEKbNTcOLALgByRmgFrpC1mF6VOtruu1RUtb62SH4jk+lIssVOBEH3x05WBAARCT6B7TI1shoY60AHScI/OSNDUFoZxJ1ep8iX/7ep2+nVH+o3R8oE5+igFx6jLGdXZzmqwfmDhbustIxn3o1LUwcVRroS/i1Y5qCzv/40CS9/Qcap/P6ECfQTJ0nuIJDrlYYLNdURq4kDz87E3fDtZfViY1os95SyQ9Ht4WPZNlnaY2Pn1ExLgnqq48OC3EUh2zJK0+JLYmMzo4X16SBjondJ+I=
+    - secure: aOygIO1zECTraNsXt2IoOlGHZ1ql3lILfmKNDs6kgAMP7G9CbnphQEHl6yZ8Ff0S6iacjS5hxhHO8yV9f3xModZP9RarQJEfd2jU3qY2zaJTGtTtCWPjQQ0LAnUeUxoSuaiQ/8YxSNTpjXkrMb2mJirr9Cny/JoEb+xe/RNlUznIP3/G7lCqvIt5Z+RJmN3ah3hlOCirx8A+kTgwLI33oQmxFVKlMr6JDj3q5a6d64P947t6s42Dxr9KTdX/dN4ArgjSmv+girqpFhTyBeNH9LgUF0zXia8mSGbPcc+ksY3w01q+zRZsNbTlkhyW2HXqWY/LScvyipW196vNWJM2Kft7itqU+OeLjOjNtbIZWkOYP5O35giDNmYUEhE/UyKC37OZ0fau9uHZNWCtGlHlWPEEItzi6aptXXmUBg73tPHr1JPfuJdirFe+O5D5Dc4tmCf/8kj3snKArXT8EQF6N9TqxroF+OnGsiGvoCr5RyAFke3FZSLIb1ODdFKLcRFZ37KPw+AZDkg6oPkXJIEidtQHRFYTQSseEBzxjvMKm/YWgNUgegsHiQ14LxU8EdPPGA8KKYdqNNoOel1HhOfDjbYvMvHvU825MNwHu0Hm1Yep0AM1YZD0lFlN9govRtYHiP11EGXqVYjgR7maaAwY/u0tItXqaeZckNw6tBfaYRQ=
+    - secure: ITB0Yfy4gjKw2xn2mbo8D/fK5w0yC+TR1pmaI9DHctks20tMZotVaeRlv3qHpbHbo7wY8Fh0FYWBqEdrmkswoqbPJDCiw1lgJBIlSLteF+gNVKWB9Hqx9roTCMXk2qI3Q1K2WIf+YjDwF9BXJ+w7GS2KAPi8Il5HMCPxmg0U9ON9B+khAW3oUFcPZBVf/AfRe5fVAsHsbbQkywnU/PSJtEf1Km8kGWfFDQAalfbmwrekukSD5mu1cmaKnES1y5i4yz36hUhFOoAZj08HXj+VfvIS6LZ+0bdySZsIdb/JZ2OyM+rGTV9hHdcH+cdNl81OXcxWKdavAR5zK0y4CWxLqQ7t8sEqXHxYB9nM6C8EBYXqfZaAaG7QG24BYBW7w9Ah7mbwb12mLYTunZ0P+g4ShXX7nCe0EBAld0NLny+P/hFRFLuAM4c4SM7LsriFlE9+eEltmAT6Zyel2f51ERG95z8wg9s2SWao9VQivudD6s0M03l4add4fcqf55Tn/IJ55ssw3OscxJveN8Rtnf/78ekQVerrBm9ka1UfZIWMGHLGSyzadkY7jyaxEWkwZfP8FXe42WIP0wSiLkPohMIAjevSgmMn/Ljxuc3b7A1ZjAUCuYJUaSheph4tNmtM8GcvfGjFnF9b5e4ajAeLKOgplfVykspf8H2H5Vk7bL3s/2w=
 
 script:
-  - mvn test -B
+  - mvn clean install -B
 
 before_deploy:
-  - POM_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
+  # Set tag to be used by releases provider
+  - export TRAVIS_TAG=$POM_VERSION
 
-# Releases config copied from https://docs.travis-ci.com/user/deployment/releases/ and secure key generated by following
-# https://stackoverflow.com/questions/25302518/travis-ci-setup-releases-with-github-token#answer-57032190
 deploy:
-  provider: releases
-  api_key:
-    secure: FamDJ2uxEL83Lx7zBot2pmuD32p8DtU8p8WsWzv9mLzO4U5QUMhWtAxMRuDTZQQg6/SiN7Ph7RQiIfMU8P2pdEDChhclRErcdEAwPGT2fuUuumYU4ZZNzk4hQo2NKd8Yz7sCIn1LFTgqDpjjlY70nS+7LW0Eski886GLMrgYJS9cyhkyMvBm0Hch5rAyZdhYts/EHKyMxbZBCwPY+pmgaaFxTmP6+Id4henwt1xfFPEaqEg+142BALEOVAkO+/KEObwoj0ITMy+zkK1m/V9/o3v59am1F1BUYzEH8PdBFnxG5R/Q9yE2rtsQIppHOXiaBm3Vew0RZ1IC22bexOPih1b/hB3nvUrvnXQhhFalOln1FcpnQaSOVkbzB7wNDhESg4qSVoTUzndLO5CbFYitNGVJ9gt6qvbwUIupTQo5hQCCXFIvEWMsBilftCm7KQPNxoKLdzUk+/Eps2wg94f8+by1B0L8XnKUiUIDcHy6TdjYL+pS15Owc9W6FalvY2l/FoElcVuEY9TBFiAngx/LMZxIoVFcc4zlEyEFYh6SfiKx5rQN5XnKdI0FxvFFw29h5ZN1Y9LRlV0xw0TMd3YketfZDQNYg3Kmz7qZ2eDTkEoKuZyDvY3mNp9kIQLSVWkqFA1oj00IA+mkwCGvDLukM5oJxyAxIbo9APUk5x5C26o=
-  file: "target/spt-development-logging-spring-${POM_VERSION}.jar"
-  skip_cleanup: true
-  on:
-    tags: true
+  # For any checkin to main branch, create a final version, tag it and push the artifacts to Sonatype
+  - provider: script
+    skip_cleanup: true
+    script:
+      mvn --settings .travis/maven-settings.xml release:prepare release:perform -DskipTests -Prelease -B
+    on:
+      branch: main
+
+  # Releases config copied from https://docs.travis-ci.com/user/deployment/releases/ and secure key generated by following
+  # https://stackoverflow.com/questions/25302518/travis-ci-setup-releases-with-github-token#answer-57032190
+  - provider: releases
+    api_key:
+      secure: U3DNN/NkzVD4N2rQsOCPm+LJznMTuxvZD0gPzs0v8I6ULCEYpXu6x50p+47apQnNLLFSlbB6oR8Sv06IfwijCS8QZTB3K0pkSkeO6COSFkS2f+8+zY11sS8rJPllrU8dKsU+TIx4sEujel37XXCYQQ/8FovPVfNs3GePs0P3a6Ry1dYBV4p4FdC+Ctat8q3zCwl3+CjX0/4rjVwqYiif78xJvB0PuC9lYYMMehQvVVBdpSCemkaPiS8EpZQZjS2Dv/NP6001+ODCPcGwqnGZ9X18uKrIKzmHgh4KpYUrrRyppxxM5nZsFL1gP0ob60KO2TPEssamIxYjQw4CpTCsxm0h6cJ08NOF6KyCFVX6TKrqZMT7SFEK6SZZtuvdgOZ7bhNsjUBjQkUscg46J+kcmoEw6rdHGWzTrKQ2UTfpcP4VkQEcLnJZ83oG9WM5AAoNsplLPQe0zHQyzufL6G8ye8pRjrjaZHKbKgXGXjYu7CIh1tGyaJRplA3NBB9l62CFMVj9fiVd8q56DwH8kMFSoV9pX2LxVyXzZbbdHEQOiOLa6UKhmDCQ+hnHeIFnnTtb++q4y9ZRarAepbddH2ibO+eANEJQvQgTQmy9CF63D6WrPn/2hw/QK8qhSYeqvnfoWi7ZH17m/nkXZwa4zjtg/sxzfx70XwjmtJQldmUyTdk=
+    file: "target/spt-development-logging-spring-${POM_VERSION}.jar"
+    skip_cleanup: true
+    on:
+      branch: main
diff --git a/.travis/gpg.asc.enc b/.travis/gpg.asc.enc
new file mode 100644
index 0000000..fdbdb11
Binary files /dev/null and b/.travis/gpg.asc.enc differ
diff --git a/.travis/maven-settings.xml b/.travis/maven-settings.xml
new file mode 100644
index 0000000..4c7f0b6
--- /dev/null
+++ b/.travis/maven-settings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+    <servers>
+        <server>
+            <id>ossrh</id>
+            <username>${env.OSSRH_USERNAME}</username>
+            <password>${env.OSSRH_PASSWORD}</password>
+        </server>
+        <server>
+            <id>github.com</id>
+            <username>${env.GITHUB_USERNAME}</username>
+            <password>${env.GITHUB_TOKEN}</password>
+        </server>
+    </servers>
+    <profiles>
+        <profile>
+            <id>ossrh</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <gpg.executable>gpg</gpg.executable>
+                <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
+            </properties>
+       </profile>
+    </profiles>
+</settings>
diff --git a/pom.xml b/pom.xml
index 2b3c096..b84eb7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.spt-development</groupId>
     <artifactId>spt-development-logging-spring</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
 
     <name>logging-spring</name>
     <description>A very simple library for getting/setting the current correlation ID, utilising ThreadLocal.</description>
@@ -29,19 +29,18 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.release>8</maven.compiler.release>
 
         <!-- Dependency versions -->
-        <aspectj.version>1.9.7</aspectj.version>
-        <slf4j.version>1.7.32</slf4j.version>
-        <spring.version>5.3.12</spring.version>
-        <spt-cid.version>2.0.0</spt-cid.version>
+        <aspectj.version>1.9.9.1</aspectj.version>
+        <slf4j.version>1.7.36</slf4j.version>
+        <spring.version>5.3.18</spring.version>
+        <spt-cid.version>2.0.11</spt-cid.version>
 
         <!-- Test dependency versions -->
         <hamcrest.version>2.2</hamcrest.version>
-        <junit-jupiter.version>5.7.2</junit-jupiter.version>
-        <logback.version>1.2.6</logback.version>
+        <junit-jupiter.version>5.8.2</junit-jupiter.version>
+        <logback.version>1.2.11</logback.version>
         <mockito.version>3.9.0</mockito.version>
 
         <!-- Plugin versions -->
@@ -54,10 +53,10 @@
         <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
         <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
+        <maven-release-plugin.version>3.0.0-M5</maven-release-plugin.version>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-        <nexus-staging-plugin.version>1.6.8</nexus-staging-plugin.version>
-        <pitest-maven.version>1.7.2</pitest-maven.version>
+        <nexus-staging-plugin.version>1.6.13</nexus-staging-plugin.version>
         <spotbugs.version>4.2.3</spotbugs.version>
         <versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
 
@@ -65,7 +64,6 @@
         <asm.version>9.2</asm.version>
         <checkstyle.version>9.0.1</checkstyle.version>
         <maven-dependency-analyzer.version>1.11.3</maven-dependency-analyzer.version>
-        <pitest-junit5-plugin.version>0.15</pitest-junit5-plugin.version>
     </properties>
 
     <dependencyManagement>
@@ -346,6 +344,15 @@
                 </configuration>
                 <version>${versions-maven-plugin.version}</version>
             </plugin>
+            <plugin>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>${maven-release-plugin.version}</version>
+                <configuration>
+                    <goals>deploy</goals>
+                    <scmCommentPrefix>[skip travis] [maven-release-plugin] </scmCommentPrefix>
+                    <tagNameFormat>@{project.version}</tagNameFormat>
+                </configuration>
+            </plugin>
         </plugins>
         <resources>
             <resource>