diff --git a/.github/scripts/sign-jnilib-files-inside-jar.sh b/.github/scripts/sign-jnilib-files-inside-jar.sh
new file mode 100755
index 000000000..55d236bae
--- /dev/null
+++ b/.github/scripts/sign-jnilib-files-inside-jar.sh
@@ -0,0 +1,18 @@
+f=$1
+entitlements=$2
+echo "Looking for 'libjansi.jnilib' files inside ${f} to sign..."
+f_name="$(basename -- $f)"
+extracted_jar_dir=extracted_${f_name}
+rm -rf $extracted_jar_dir
+mkdir $extracted_jar_dir
+echo "Extracting archive ${f}"
+unzip -q $f -d ./${extracted_jar_dir}
+for jnilib_file in `find $extracted_jar_dir -type f | grep -E ".*/libjansi\.jnilib$"`
+do
+  echo "Signing binary file: ${jnilib_file}"
+  codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" $jnilib_file
+done
+cd $extracted_jar_dir
+zip -r -u $f .
+cd ..
+rm -rf $extracted_jar_dir
\ No newline at end of file
diff --git a/.github/scripts/sign-osx-distro-file.sh b/.github/scripts/sign-osx-distro-file.sh
index 5ed60ae24..f3e20c37a 100755
--- a/.github/scripts/sign-osx-distro-file.sh
+++ b/.github/scripts/sign-osx-distro-file.sh
@@ -17,10 +17,16 @@ tar -zxf $file --directory ${dir}/${destination_folder_name}
 echo "Successfully extracted ${filename}"
 
 # sign problematic binaries
-for file in `find ${dir}/${destination_folder_name}/SpringToolSuite4.app -type f | grep -E ".*/(kotlin-compiler-embeddable.*\.jar|fsevents\.node)$"`
+for f in `find ${dir}/${destination_folder_name}/SpringToolSuite4.app -type f | grep -E ".*/fsevents\.node$"`
 do
-  echo "Signing binary file: ${file}"
-  codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" $file
+  echo "Signing binary file: ${f}"
+  codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" $f
+done
+
+# sign libjansi.jnilib inside kotlin-compiler-embeddable.jar
+for f in `find ${dir}/${destination_folder_name}/SpringToolSuite4.app -type f | grep -E ".*/kotlin-compiler-embeddable.*\.jar$"`
+do
+  ./sign-jnilib-files-inside-jar.sh $f $entitlements
 done
 
 # Sign the app
diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index 2f842409e..d435a4f33 100644
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -118,7 +118,7 @@
 
 		<!-- Rewrite specific properties -->
 		<rewrite-version>8.9.0-SNAPSHOT</rewrite-version>
-		<rewrite-kotlin-version>1.5.1</rewrite-kotlin-version>
+		<rewrite-kotlin-version>1.7.3</rewrite-kotlin-version>
 		<rewrite-spring-version>5.1.0-SNAPSHOT</rewrite-spring-version>
 		<rewrite-gradle-tooling-api-version>1.3.2</rewrite-gradle-tooling-api-version>