diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee305624..6fc81b33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## [0.8.15] - 2025-12-23
+
+### Fixed
+
+* Fix X509SVID hint deduplication to apply only to non-empty hints (#385)
+
+### Dependency updates
+
+* Remove lombok and replace all annotations with plain java implementations (#377)
+* Bump io.netty:netty-transport-native-kqueue to 4.2.9.Final (#381)
+* Bump com.google.protobuf to 0.9.6 (#389)
+
+### Build 
+
+* Upgrade to Gradle 9.2.1 and migrate Shadow plugin (#380)
+* Remove deprecations and prep for Gradle 10 (#384)
+* Add Makefile (#388)
+
+
 ## [0.8.14] - 2025-12-09
 
 ### Dependency updates
diff --git a/README.md b/README.md
index d5d8b2d2..6af8e919 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ X.509 and JWT SVIDs and bundles.
 Download
 --------
 
-The JARs can be downloaded from [Maven Central](https://search.maven.org/search?q=g:io.spiffe%20AND%20v:0.8.14). 
+The JARs can be downloaded from [Maven Central](https://search.maven.org/search?q=g:io.spiffe%20AND%20v:0.8.15). 
 
 The dependencies can be added to `pom.xml`
 
@@ -35,7 +35,7 @@ To import the `java-spiffe-provider` component:
 <dependency>
   <groupId>io.spiffe</groupId>
   <artifactId>java-spiffe-provider</artifactId>
-  <version>0.8.14</version>
+  <version>0.8.15</version>
 </dependency>
 ```
 The `java-spiffe-provider` component imports the `java-spiffe-core` component.
@@ -45,7 +45,7 @@ To just import the `java-spiffe-core` component:
 <dependency>
   <groupId>io.spiffe</groupId>
   <artifactId>java-spiffe-core</artifactId>
-  <version>0.8.14</version>
+  <version>0.8.15</version>
 </dependency>
 ```
 
@@ -53,12 +53,12 @@ Using Gradle:
 
 Import `java-spiffe-provider`:
 ```gradle
-implementation group: 'io.spiffe', name: 'java-spiffe-provider', version: '0.8.14'
+implementation group: 'io.spiffe', name: 'java-spiffe-provider', version: '0.8.15'
 ```
 
 Import `java-spiffe-core`:
 ```gradle
-implementation group: 'io.spiffe', name: 'java-spiffe-core', version: '0.8.14'
+implementation group: 'io.spiffe', name: 'java-spiffe-core', version: '0.8.15'
 ```
 
 ### MacOS Support
@@ -72,14 +72,14 @@ In case run on a osx-x86 architecture, add to your `pom.xml`:
 <dependency>
   <groupId>io.spiffe</groupId>
   <artifactId>grpc-netty-macos</artifactId>
-  <version>0.8.14</version>
+  <version>0.8.15</version>
   <scope>runtime</scope>
 </dependency>
 ```
 
 Using Gradle:
 ```gradle
-runtimeOnly group: 'io.spiffe', name: 'grpc-netty-macos', version: '0.8.14'
+runtimeOnly group: 'io.spiffe', name: 'grpc-netty-macos', version: '0.8.15'
 ```
 
 #### Aarch64 (M1) Architecture
@@ -91,7 +91,7 @@ If you are running the aarch64 architecture (M1 CPUs), add to your `pom.xml`:
 <dependency>
   <groupId>io.spiffe</groupId>
   <artifactId>grpc-netty-macos-aarch64</artifactId>
-  <version>0.8.14</version>
+  <version>0.8.15</version>
   <scope>runtime</scope>
 </dependency>
 ```
@@ -99,7 +99,7 @@ If you are running the aarch64 architecture (M1 CPUs), add to your `pom.xml`:
 Using Gradle:
 
 ```gradle
-runtimeOnly group: 'io.spiffe', name: 'grpc-netty-macos-aarch64', version: '0.8.14'
+runtimeOnly group: 'io.spiffe', name: 'grpc-netty-macos-aarch64', version: '0.8.15'
 ```
 
 *Caveat: not all OpenJDK distributions are aarch64 native, make sure your JDK is also running
@@ -112,7 +112,7 @@ The `java-spiffe-helper` module manages X.509 SVIDs and Bundles in Java Keystore
 
 ### Docker Image
 
-Pull the `java-spiffe-helper` image from `ghcr.io/spiffe/java-spiffe-helper:0.8.14`.
+Pull the `java-spiffe-helper` image from `ghcr.io/spiffe/java-spiffe-helper:0.8.15`.
 
 For more details, see [java-spiffe-helper/README.md](java-spiffe-helper/README.md).
 
diff --git a/gradle.properties b/gradle.properties
index c9c8f160..383022d0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=0.8.14
+version=0.8.15
diff --git a/java-spiffe-helper/README.md b/java-spiffe-helper/README.md
index 60edf32d..e5e9dfd1 100644
--- a/java-spiffe-helper/README.md
+++ b/java-spiffe-helper/README.md
@@ -10,11 +10,11 @@ The Helper automatically gets the SVID updates and stores them in the KeyStore a
 
 On Linux:
 
-`java -jar java-spiffe-helper-0.8.14-linux-x86_64.jar`
+`java -jar java-spiffe-helper-0.8.15-linux-x86_64.jar`
 
 On Mac OS:
 
-`java -jar java-spiffe-helper-0.8.14-osx-x86_64.jar`
+`java -jar java-spiffe-helper-0.8.15-osx-x86_64.jar`
 
 You can run the utility with the `-c` or `--config` option to specify the path to the configuration file. By default, it
 will look for a configuration file named `conf/java-spiffe-helper.properties` in the current working directory.