diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1e156112..b732f51c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
   * (PW-2113) `MxParseUtils` added methods to extract comments from XML string
   * Added new SettlementInfo class, and added MxParseUtils#getSettlementInfo to extract it from a raw MX message.
   * Moved and enhanced the MxSwiftMessage#findElement to support multiple element's path 
+  * Update apache-commons-lang3 from 3.14.0 to 3.17.0 fixing derived apache-text dependency vulnerabilities
+  * Gradle wrapper update to 8.12
  
 #### 9.5.4 - August 2024
   * (PW-1958) Fixed the `DefaultMxMetadataStrategy` NPE issue when the amount values are null
diff --git a/build.gradle b/build.gradle
index 0b67655e6..9f3201e65 100644
--- a/build.gradle
+++ b/build.gradle
@@ -134,7 +134,7 @@ configure(subprojects.findAll {it.name.endsWith('-mx')}) {
 project(':iso20022-core') {
 	dependencies {
 		// included build
-		api 'com.prowidesoftware:pw-swift-core:SRU2024-9.5.2'
+		api 'com.prowidesoftware:pw-swift-core:SRU2024-9.5.5'
 
 		implementation 'org.apache.commons:commons-lang3:3.14.0'
 		implementation 'com.google.code.gson:gson:2.11.0'
@@ -313,8 +313,8 @@ artifacts {
 // declared dependencies for pom generation
 dependencies {
 	// included build (keep in sync with the latest Prowide Core version)
-	api 'com.prowidesoftware:pw-swift-core:SRU2024-9.5.2'
-	implementation 'org.apache.commons:commons-lang3:3.14.0'
+	api 'com.prowidesoftware:pw-swift-core:SRU2024-9.5.5'
+	implementation 'org.apache.commons:commons-lang3:3.17.0'
 	implementation 'com.google.code.gson:gson:2.10'
 }
 
@@ -452,7 +452,7 @@ tasks.register('bundle', Jar) {
 	from ("$buildDir/libs") {
 		include '*.asc'
 	}
-	archiveName 'bundle.jar'
+	archiveFileName.set('bundle.jar')
 }
 
 tasks.withType(Test) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c7d437bbb..18362b78b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists