diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index a426d86b..332ab4dc 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -15,6 +15,7 @@ jobs:
         java:
           - 11
           - 17
+          - 21
       fail-fast: false
     runs-on: [ubuntu-latest]
     name: Building PA package
diff --git a/build.gradle b/build.gradle
index 8a677753..118ef87b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,7 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'nebula.ospackage' version "8.3.0"
+    id 'com.netflix.nebula.ospackage' version "11.6.0"
     id 'com.github.spotbugs' version '5.0.13'
     id 'jacoco'
     id 'com.diffplug.spotless' version '5.11.0'
@@ -217,9 +217,9 @@ jacoco {
 
 jacocoTestReport {
     reports {
-        xml.enabled true
-        html.enabled true
-        csv.enabled false
+        xml.required = true
+        html.required = true
+        csv.required = false
     }
     afterEvaluate {
         classDirectories.from = files(classDirectories.files.collect {
@@ -301,7 +301,7 @@ dependencies {
     implementation 'org.jooq:jooq:3.10.8'
     implementation 'org.apache.commons:commons-lang3:3.9'
     implementation 'org.bouncycastle:bcprov-jdk15to18:1.75'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
+    implementation 'org.bouncycastle:bcpkix-jdk18on:1.74'
     implementation "org.opensearch:performance-analyzer-commons:${paCommonsVersion}"
     implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
     implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}"
@@ -872,10 +872,9 @@ afterEvaluate {
         task renameRpm(type: Copy) {
             from("$buildDir/distributions")
             into("$buildDir/distributions")
-            include archiveName
-            rename archiveName, "${packageName}-${version}.rpm"
+            rename "$archiveFileName", "${packageName}-${version}.rpm"
             doLast {
-                delete file("$buildDir/distributions/$archiveName")
+                delete file("$buildDir/distributions/$archiveFileName")
             }
         }
     }
@@ -889,10 +888,9 @@ afterEvaluate {
         task renameDeb(type: Copy) {
             from("$buildDir/distributions")
             into("$buildDir/distributions")
-            include archiveName
-            rename archiveName, "${packageName}-${version}.deb"
+            rename "$archiveFileName", "${packageName}-${version}.deb"
             doLast {
-                delete file("$buildDir/distributions/$archiveName")
+                delete file("$buildDir/distributions/$archiveFileName")
             }
         }
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 50832291..3499ded5 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.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/licenses/bcpkix-jdk15on-1.70.jar.sha1 b/licenses/bcpkix-jdk15on-1.70.jar.sha1
deleted file mode 100644
index e348463a..00000000
--- a/licenses/bcpkix-jdk15on-1.70.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f81e5af49571a9d5a109a88f239a73ce87055417
\ No newline at end of file
diff --git a/licenses/bcpkix-jdk18on-1.74.jar.sha1 b/licenses/bcpkix-jdk18on-1.74.jar.sha1
new file mode 100644
index 00000000..59ea623a
--- /dev/null
+++ b/licenses/bcpkix-jdk18on-1.74.jar.sha1
@@ -0,0 +1 @@
+a197fb87f0697c1925e7248865ee84516fdb6d9c
\ No newline at end of file
diff --git a/licenses/bcpkix-jdk15on-LICENSE.txt b/licenses/bcpkix-jdk18on-LICENSE.txt
similarity index 93%
rename from licenses/bcpkix-jdk15on-LICENSE.txt
rename to licenses/bcpkix-jdk18on-LICENSE.txt
index d067d154..a00af434 100644
--- a/licenses/bcpkix-jdk15on-LICENSE.txt
+++ b/licenses/bcpkix-jdk18on-LICENSE.txt
@@ -1,5 +1,5 @@
 LICENSE
-Copyright (c) 2000 - 2019 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
+Copyright (c) 2000 - 2024 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/licenses/bcpkix-jdk15on-NOTICE.txt b/licenses/bcpkix-jdk18on-NOTICE.txt
similarity index 100%
rename from licenses/bcpkix-jdk15on-NOTICE.txt
rename to licenses/bcpkix-jdk18on-NOTICE.txt
diff --git a/licenses/jackson-annotations-2.15.2.jar.sha1 b/licenses/jackson-annotations-2.15.2.jar.sha1
deleted file mode 100644
index f63416dd..00000000
--- a/licenses/jackson-annotations-2.15.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4724a65ac8e8d156a24898d50fd5dbd3642870b8
\ No newline at end of file
diff --git a/licenses/jackson-annotations-2.16.1.jar.sha1 b/licenses/jackson-annotations-2.16.1.jar.sha1
new file mode 100644
index 00000000..cbc65687
--- /dev/null
+++ b/licenses/jackson-annotations-2.16.1.jar.sha1
@@ -0,0 +1 @@
+fd441d574a71e7d10a4f73de6609f881d8cdfeec
\ No newline at end of file
diff --git a/licenses/jackson-databind-2.15.2.jar.sha1 b/licenses/jackson-databind-2.15.2.jar.sha1
deleted file mode 100644
index f16d80af..00000000
--- a/licenses/jackson-databind-2.15.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9353b021f10c307c00328f52090de2bdb4b6ff9c
\ No newline at end of file
diff --git a/licenses/jackson-databind-2.16.1.jar.sha1 b/licenses/jackson-databind-2.16.1.jar.sha1
new file mode 100644
index 00000000..d231db4f
--- /dev/null
+++ b/licenses/jackson-databind-2.16.1.jar.sha1
@@ -0,0 +1 @@
+02a16efeb840c45af1e2f31753dfe76795278b73
\ No newline at end of file
diff --git a/licenses/jackson-module-paranamer-2.15.2.jar.sha1 b/licenses/jackson-module-paranamer-2.15.2.jar.sha1
deleted file mode 100644
index 11724827..00000000
--- a/licenses/jackson-module-paranamer-2.15.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-afa71e1b9e9eee5664481cab589487d0a7f83ff4
\ No newline at end of file
diff --git a/licenses/jackson-module-paranamer-2.16.1.jar.sha1 b/licenses/jackson-module-paranamer-2.16.1.jar.sha1
new file mode 100644
index 00000000..1b0a9a3f
--- /dev/null
+++ b/licenses/jackson-module-paranamer-2.16.1.jar.sha1
@@ -0,0 +1 @@
+8ccd968bf3c07b7a67f099ca8709b3fed5ffedae
\ No newline at end of file
diff --git a/licenses/netty-buffer-4.1.104.Final.jar.sha1 b/licenses/netty-buffer-4.1.104.Final.jar.sha1
new file mode 100644
index 00000000..30f215e4
--- /dev/null
+++ b/licenses/netty-buffer-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+756797174b94a3aee11ce83522473f3c18287a43
\ No newline at end of file
diff --git a/licenses/netty-buffer-4.1.106.Final.jar.sha1 b/licenses/netty-buffer-4.1.106.Final.jar.sha1
new file mode 100644
index 00000000..1f170375
--- /dev/null
+++ b/licenses/netty-buffer-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+c5495ba59a627641b3a7c23f6bcb801874c7f7b0
\ No newline at end of file
diff --git a/licenses/netty-buffer-4.1.97.Final.jar.sha1 b/licenses/netty-buffer-4.1.97.Final.jar.sha1
deleted file mode 100644
index 84303553..00000000
--- a/licenses/netty-buffer-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f8f3d8644afa5e6e1a40a3a6aeb9d9aa970ecb4f
\ No newline at end of file
diff --git a/licenses/netty-codec-4.1.104.Final.jar.sha1 b/licenses/netty-codec-4.1.104.Final.jar.sha1
new file mode 100644
index 00000000..9ed9b896
--- /dev/null
+++ b/licenses/netty-codec-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+f51fcfd3baac88b2c0b8dc715932ad5622d17429
\ No newline at end of file
diff --git a/licenses/netty-codec-4.1.106.Final.jar.sha1 b/licenses/netty-codec-4.1.106.Final.jar.sha1
new file mode 100644
index 00000000..a75ea81b
--- /dev/null
+++ b/licenses/netty-codec-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+025171b63aa1e7a5fd8a7e4e660d6d3110241ea7
\ No newline at end of file
diff --git a/licenses/netty-codec-4.1.97.Final.jar.sha1 b/licenses/netty-codec-4.1.97.Final.jar.sha1
deleted file mode 100644
index 7a36dc1f..00000000
--- a/licenses/netty-codec-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-384ba4d75670befbedb45c4d3b497a93639c206d
\ No newline at end of file
diff --git a/licenses/netty-codec-http-4.1.104.Final.jar.sha1 b/licenses/netty-codec-http-4.1.104.Final.jar.sha1
new file mode 100644
index 00000000..478e7cfb
--- /dev/null
+++ b/licenses/netty-codec-http-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+2db1556de1b8dc07695604bf51a0a133263ad63f
\ No newline at end of file
diff --git a/licenses/netty-codec-http-4.1.106.Final.jar.sha1 b/licenses/netty-codec-http-4.1.106.Final.jar.sha1
new file mode 100644
index 00000000..7f5d1adb
--- /dev/null
+++ b/licenses/netty-codec-http-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+21a07cdf0fc46b313fe2248f1275cdbdac0ba87b
\ No newline at end of file
diff --git a/licenses/netty-codec-http-4.1.97.Final.jar.sha1 b/licenses/netty-codec-http-4.1.97.Final.jar.sha1
deleted file mode 100644
index 37b78a32..00000000
--- a/licenses/netty-codec-http-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-af78acec783ffd77c63d8aeecc21041fd39ac54f
\ No newline at end of file
diff --git a/licenses/netty-codec-http2-4.1.104.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
new file mode 100644
index 00000000..f0242709
--- /dev/null
+++ b/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+5bb757929f7c4d1bf12740a378a99643caaad1ac
\ No newline at end of file
diff --git a/licenses/netty-codec-http2-4.1.106.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
new file mode 100644
index 00000000..c4a0c1fa
--- /dev/null
+++ b/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+41515e8c51eeaaddceabdb4f86fbc5dbfc25b70e
\ No newline at end of file
diff --git a/licenses/netty-codec-http2-4.1.97.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.97.Final.jar.sha1
deleted file mode 100644
index cbf685a6..00000000
--- a/licenses/netty-codec-http2-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-893888d09a7bef0d0ba973d7471943e765d0fd08
\ No newline at end of file
diff --git a/licenses/netty-codec-socks-4.1.104.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.104.Final.jar.sha1
new file mode 100644
index 00000000..3b6cd352
--- /dev/null
+++ b/licenses/netty-codec-socks-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+5b126ceba61275f38297cacd5ea0cd6d3addee04
\ No newline at end of file
diff --git a/licenses/netty-codec-socks-4.1.106.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.106.Final.jar.sha1
new file mode 100644
index 00000000..4fc3f5c4
--- /dev/null
+++ b/licenses/netty-codec-socks-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+129f9bd6aa0cf28bfd7d45a8b6a598eed9c67702
\ No newline at end of file
diff --git a/licenses/netty-codec-socks-4.1.97.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.97.Final.jar.sha1
deleted file mode 100644
index d06147a0..00000000
--- a/licenses/netty-codec-socks-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-30e8fa29a349db5a933225d61891b8802836bb79
\ No newline at end of file
diff --git a/licenses/netty-common-4.1.104.Final.jar.sha1 b/licenses/netty-common-4.1.104.Final.jar.sha1
new file mode 100644
index 00000000..1b533eea
--- /dev/null
+++ b/licenses/netty-common-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+ec5fc4a7c5475eb20805e14f7274aa28872b5ba1
\ No newline at end of file
diff --git a/licenses/netty-common-4.1.106.Final.jar.sha1 b/licenses/netty-common-4.1.106.Final.jar.sha1
new file mode 100644
index 00000000..bda8b937
--- /dev/null
+++ b/licenses/netty-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+132defb4689f41b51b483b7202b22b6e89fe35fd
\ No newline at end of file
diff --git a/licenses/netty-common-4.1.97.Final.jar.sha1 b/licenses/netty-common-4.1.97.Final.jar.sha1
deleted file mode 100644
index 1bdfec3a..00000000
--- a/licenses/netty-common-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7cceacaf11df8dc63f23d0fb58e9d4640fc88404
\ No newline at end of file
diff --git a/licenses/netty-handler-4.1.104.Final.jar.sha1 b/licenses/netty-handler-4.1.104.Final.jar.sha1
new file mode 100644
index 00000000..70777be4
--- /dev/null
+++ b/licenses/netty-handler-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+18c0e659950cdef5f12c36eccfa14cbd2ad2049d
\ No newline at end of file
diff --git a/licenses/netty-handler-4.1.106.Final.jar.sha1 b/licenses/netty-handler-4.1.106.Final.jar.sha1
new file mode 100644
index 00000000..749cc807
--- /dev/null
+++ b/licenses/netty-handler-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+874c970c4ff958b1140dde52bc17e6a9e7cde662
\ No newline at end of file
diff --git a/licenses/netty-handler-4.1.97.Final.jar.sha1 b/licenses/netty-handler-4.1.97.Final.jar.sha1
deleted file mode 100644
index 8b7b50a6..00000000
--- a/licenses/netty-handler-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-abb86c6906bf512bf2b797a41cd7d2e8d3cd7c36
\ No newline at end of file
diff --git a/licenses/netty-handler-proxy-4.1.104.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.104.Final.jar.sha1
new file mode 100644
index 00000000..9d01e814
--- /dev/null
+++ b/licenses/netty-handler-proxy-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+50a2d899a8f8a68daed1a9b6d7750184310cc45f
\ No newline at end of file
diff --git a/licenses/netty-handler-proxy-4.1.106.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.106.Final.jar.sha1
new file mode 100644
index 00000000..3dcfa7f2
--- /dev/null
+++ b/licenses/netty-handler-proxy-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+bffc88b7c56d7b553453e4244247a1b0ba1fdc8a
\ No newline at end of file
diff --git a/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1
deleted file mode 100644
index 67c3a763..00000000
--- a/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a99ecef0e1d86a92e40a7c89805c236d9cd7493e
\ No newline at end of file
diff --git a/licenses/netty-resolver-4.1.104.Final.jar.sha1 b/licenses/netty-resolver-4.1.104.Final.jar.sha1
new file mode 100644
index 00000000..d7c15af9
--- /dev/null
+++ b/licenses/netty-resolver-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+dfa4fe5c3a6eabb7af09902eb63266829876d8a2
\ No newline at end of file
diff --git a/licenses/netty-resolver-4.1.106.Final.jar.sha1 b/licenses/netty-resolver-4.1.106.Final.jar.sha1
new file mode 100644
index 00000000..bd160c07
--- /dev/null
+++ b/licenses/netty-resolver-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+e185ae573db04939215f94d6ba869758dcecbde9
\ No newline at end of file
diff --git a/licenses/netty-resolver-4.1.97.Final.jar.sha1 b/licenses/netty-resolver-4.1.97.Final.jar.sha1
deleted file mode 100644
index 032959e9..00000000
--- a/licenses/netty-resolver-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cec8348108dc76c47cf87c669d514be52c922144
\ No newline at end of file
diff --git a/licenses/netty-transport-4.1.104.Final.jar.sha1 b/licenses/netty-transport-4.1.104.Final.jar.sha1
new file mode 100644
index 00000000..5cacaf11
--- /dev/null
+++ b/licenses/netty-transport-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+da7b263b6fedc5add70e78ee8927c8bd2b9bb589
\ No newline at end of file
diff --git a/licenses/netty-transport-4.1.106.Final.jar.sha1 b/licenses/netty-transport-4.1.106.Final.jar.sha1
new file mode 100644
index 00000000..2dab4bff
--- /dev/null
+++ b/licenses/netty-transport-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+8fcca44ae16b98e15965093e7696832019fd6f27
\ No newline at end of file
diff --git a/licenses/netty-transport-4.1.97.Final.jar.sha1 b/licenses/netty-transport-4.1.97.Final.jar.sha1
deleted file mode 100644
index 107863c1..00000000
--- a/licenses/netty-transport-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f37380d23c9bb079bc702910833b2fd532c9abd0
\ No newline at end of file
diff --git a/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
new file mode 100644
index 00000000..64797bf1
--- /dev/null
+++ b/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+d4da9f7237ac3ac292891e0b2d5364acbce128cf
\ No newline at end of file
diff --git a/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
new file mode 100644
index 00000000..b4b977fd
--- /dev/null
+++ b/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+2da179bd95903f0fa73218b8f0d02690c0cfbc94
\ No newline at end of file
diff --git a/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1
deleted file mode 100644
index f736d37d..00000000
--- a/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d469d84265ab70095b01b40886cabdd433b6e664
\ No newline at end of file
diff --git a/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1 b/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1
deleted file mode 100644
index 6b958715..00000000
--- a/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0f872542fa9a89746f0cd60fc465c33537d41701
\ No newline at end of file
diff --git a/licenses/performance-analyzer-commons-1.3.0-SNAPSHOT.jar.sha1 b/licenses/performance-analyzer-commons-1.3.0-SNAPSHOT.jar.sha1
new file mode 100644
index 00000000..12caa29b
--- /dev/null
+++ b/licenses/performance-analyzer-commons-1.3.0-SNAPSHOT.jar.sha1
@@ -0,0 +1 @@
+a7390b56028ff0ec41c0114036cec55a511bfe91
\ No newline at end of file