diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 69aa4c9667c9c..e4a9293c59b8f 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 opensearch        = 3.0.0
-lucene            = 9.7.0
+lucene            = 9.8.0-snapshot-4373c3b
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 20.0.2+9
diff --git a/libs/core/licenses/lucene-core-9.7.0.jar.sha1 b/libs/core/licenses/lucene-core-9.7.0.jar.sha1
deleted file mode 100644
index 2b0f77275c0ab..0000000000000
--- a/libs/core/licenses/lucene-core-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ad391210ffd806931334be9670a35af00c56f959
\ No newline at end of file
diff --git a/libs/core/licenses/lucene-core-9.8.0-snapshot-4373c3b.jar.sha1 b/libs/core/licenses/lucene-core-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..dc363f2776429
--- /dev/null
+++ b/libs/core/licenses/lucene-core-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+30c3afcf058532d3d2b8820375043000e7f34a9b
\ No newline at end of file
diff --git a/libs/core/src/main/java/org/opensearch/Version.java b/libs/core/src/main/java/org/opensearch/Version.java
index f85da63bdbb1f..9329f221922ea 100644
--- a/libs/core/src/main/java/org/opensearch/Version.java
+++ b/libs/core/src/main/java/org/opensearch/Version.java
@@ -55,7 +55,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
      * The logic for ID is: XXYYZZAA, where XX is major version, YY is minor version, ZZ is revision, and AA is alpha/beta/rc indicator AA
      * values below 25 are for alpha builder (since 5.0), and above 25 and below 50 are beta builds, and below 99 are RC builds, with 99
      * indicating a release the (internal) format of the id is there so we can easily do after/before checks on the id
-     *
+     *>>
      * IMPORTANT: Unreleased vs. Released Versions
      *
      * All listed versions MUST be released versions, except the last major, the last minor and the last revison. ONLY those are required
@@ -91,7 +91,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_2_8_1 = new Version(2080199, org.apache.lucene.util.Version.LUCENE_9_6_0);
     public static final Version V_2_9_0 = new Version(2090099, org.apache.lucene.util.Version.LUCENE_9_7_0);
     public static final Version V_2_10_0 = new Version(2100099, org.apache.lucene.util.Version.LUCENE_9_7_0);
-    public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_7_0);
+    public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_8_0);
     public static final Version CURRENT = V_3_0_0;
 
     public static Version fromId(int id) {
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.7.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.7.0.jar.sha1
deleted file mode 100644
index ecf696b4b3b83..0000000000000
--- a/modules/lang-expression/licenses/lucene-expressions-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-297e1cfade4ef71466cc9d4f361d81807c8dc4c8
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.8.0-snapshot-4373c3b.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..6eaa40708e4ae
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+9f8a34fc3d450343ab05ccb5af318a836a6a5fb3
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0.jar.sha1
deleted file mode 100644
index 0ed030926ab93..0000000000000
--- a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-94293b169fb8572f440a5a4a523320ecf9778ffe
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.8.0-snapshot-4373c3b.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..8a3332c950b6d
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+fde64e3b23bc9a0849b9897febfe9f13c5113143
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1
deleted file mode 100644
index ddd67276606a5..0000000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2df800a38b64867b8dcd61fc2cd986114e4a80cb
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.8.0-snapshot-4373c3b.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..33c2afacf2395
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+b01a791705fa01fce48dd02ea79fa8045de8dd5e
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0.jar.sha1
deleted file mode 100644
index 0cd68af98e724..0000000000000
--- a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a01e8153f34d72e8c8c0180c1dea5b10f677dd3a
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.8.0-snapshot-4373c3b.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..1e7986dafa11e
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+43d19320b1b9cd18638b1602fa87d5f21ee043bc
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1
deleted file mode 100644
index c7b4d2dc6da75..0000000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b7d47d54683b0b1e09b271c32d1b7d3eb1990f49
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.8.0-snapshot-4373c3b.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..14880d9c2d243
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+9244dc232f175010b480d4d88e13945c17a0b28b
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1
deleted file mode 100644
index 8df7245044171..0000000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5e68b9816e6cff8ee15f5b350cf2ffa54f9828b7
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.8.0-snapshot-4373c3b.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..edc4de3fffe28
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+3101a4f79820c1ca3dfb8f49b74c5fb5b32940e1
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0.jar.sha1
deleted file mode 100644
index 974e4202f5ffb..0000000000000
--- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d23b1f05b471e05d0d6068b3ece7c8c65672eae7
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.8.0-snapshot-4373c3b.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..54c310277b09b
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+f12b2a22cd5ebcd84f40a40e78fdd4e268b3b26d
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1
deleted file mode 100644
index dce408a7d40ef..0000000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfb4313f3c68d337310522840d7144c1605d084a
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.8.0-snapshot-4373c3b.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..358db9ea3f0f5
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+7dbf5cc3dff93cc1ffe45d79b129859590d001dd
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-9.7.0.jar.sha1 b/server/licenses/lucene-analysis-common-9.7.0.jar.sha1
deleted file mode 100644
index 45d8f459573b1..0000000000000
--- a/server/licenses/lucene-analysis-common-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-27ba6caaa4587a982cd451f7217b5a982bcfc44a
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-9.8.0-snapshot-4373c3b.jar.sha1 b/server/licenses/lucene-analysis-common-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..e7c7dc2bbc046
--- /dev/null
+++ b/server/licenses/lucene-analysis-common-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+1446b7641743a1082b566179d1bf2960f5a0724b
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.7.0.jar.sha1 b/server/licenses/lucene-backward-codecs-9.7.0.jar.sha1
deleted file mode 100644
index 3981ea4fa226e..0000000000000
--- a/server/licenses/lucene-backward-codecs-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6389463bfbfcf902c8d31d12e9513a6818ac9d5e
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.8.0-snapshot-4373c3b.jar.sha1 b/server/licenses/lucene-backward-codecs-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..d0f64519cd6ff
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+127032ea137d2501b24f0e35e5f9a2e1c7864633
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.7.0.jar.sha1 b/server/licenses/lucene-core-9.7.0.jar.sha1
deleted file mode 100644
index 2b0f77275c0ab..0000000000000
--- a/server/licenses/lucene-core-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ad391210ffd806931334be9670a35af00c56f959
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.8.0-snapshot-4373c3b.jar.sha1 b/server/licenses/lucene-core-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..dc363f2776429
--- /dev/null
+++ b/server/licenses/lucene-core-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+30c3afcf058532d3d2b8820375043000e7f34a9b
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.7.0.jar.sha1 b/server/licenses/lucene-grouping-9.7.0.jar.sha1
deleted file mode 100644
index 90acbf6dcee8d..0000000000000
--- a/server/licenses/lucene-grouping-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8e6f0c229f4861be641047c33b05067176e4279c
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.8.0-snapshot-4373c3b.jar.sha1 b/server/licenses/lucene-grouping-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..294beba43f62a
--- /dev/null
+++ b/server/licenses/lucene-grouping-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+e6f742efe0ef3b383468fe38f88ab2dd69ed3d2c
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.7.0.jar.sha1 b/server/licenses/lucene-highlighter-9.7.0.jar.sha1
deleted file mode 100644
index bfcca0bc6cb5b..0000000000000
--- a/server/licenses/lucene-highlighter-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-facb7c7ee0f75ed457a2d98f10d6430e25a53691
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.8.0-snapshot-4373c3b.jar.sha1 b/server/licenses/lucene-highlighter-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..c2a2ef5b13946
--- /dev/null
+++ b/server/licenses/lucene-highlighter-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+3162856444777130dee2c4cabe1bf6d18710ff63
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.7.0.jar.sha1 b/server/licenses/lucene-join-9.7.0.jar.sha1
deleted file mode 100644
index 0dab3a7ddc41a..0000000000000
--- a/server/licenses/lucene-join-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d041bdc0947a14223cf68357407ee18b21027587
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.8.0-snapshot-4373c3b.jar.sha1 b/server/licenses/lucene-join-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..7c6adaaba9cf1
--- /dev/null
+++ b/server/licenses/lucene-join-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+5fe8383516eca7300f978ce38042e327b0a57877
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.7.0.jar.sha1 b/server/licenses/lucene-memory-9.7.0.jar.sha1
deleted file mode 100644
index 357a9c4b2ea26..0000000000000
--- a/server/licenses/lucene-memory-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0fade51ee353e15ddbbc45262aafe6f99ed020f1
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.8.0-snapshot-4373c3b.jar.sha1 b/server/licenses/lucene-memory-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..586702c968a77
--- /dev/null
+++ b/server/licenses/lucene-memory-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+b3e77970485be6d2dd59b999bbaa65a2cb993744
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.7.0.jar.sha1 b/server/licenses/lucene-misc-9.7.0.jar.sha1
deleted file mode 100644
index da5e1921626b2..0000000000000
--- a/server/licenses/lucene-misc-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7fcf451e2376526c3a027958812866cc5b0ff13f
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.8.0-snapshot-4373c3b.jar.sha1 b/server/licenses/lucene-misc-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..493598eefff5e
--- /dev/null
+++ b/server/licenses/lucene-misc-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+86d667ea2f7fb2142d2acacf801dcea47d014a5e
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.7.0.jar.sha1 b/server/licenses/lucene-queries-9.7.0.jar.sha1
deleted file mode 100644
index fa82e95a7e19f..0000000000000
--- a/server/licenses/lucene-queries-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-126989d4622419aa06fcbf3a342e859cab8c8799
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.8.0-snapshot-4373c3b.jar.sha1 b/server/licenses/lucene-queries-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..1bf937f10d795
--- /dev/null
+++ b/server/licenses/lucene-queries-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+930d004de698f374da8ac5530fd80e241edeba45
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.7.0.jar.sha1 b/server/licenses/lucene-queryparser-9.7.0.jar.sha1
deleted file mode 100644
index 438db0aea66e1..0000000000000
--- a/server/licenses/lucene-queryparser-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6e77bde908ff698354e4a2149e6dd4658b56d7b0
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.8.0-snapshot-4373c3b.jar.sha1 b/server/licenses/lucene-queryparser-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..74458bc93f90b
--- /dev/null
+++ b/server/licenses/lucene-queryparser-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+f62882823d5aa9ed4cf0081a8c18f35e21992080
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.7.0.jar.sha1 b/server/licenses/lucene-sandbox-9.7.0.jar.sha1
deleted file mode 100644
index 38b0b1cccbc29..0000000000000
--- a/server/licenses/lucene-sandbox-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9f3e8e1947f2f1c5784132444af51a060ff0b4bf
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.8.0-snapshot-4373c3b.jar.sha1 b/server/licenses/lucene-sandbox-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..3231d0e067940
--- /dev/null
+++ b/server/licenses/lucene-sandbox-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+f1ec1527e283b423b7ff5e12cd8d889e7247199d
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-9.7.0.jar.sha1 b/server/licenses/lucene-spatial-extras-9.7.0.jar.sha1
deleted file mode 100644
index 48679df469fd1..0000000000000
--- a/server/licenses/lucene-spatial-extras-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-01b0bc7a407d8c35a70a1adf7966bb3e7caae928
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-9.8.0-snapshot-4373c3b.jar.sha1 b/server/licenses/lucene-spatial-extras-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..dd47faf91f206
--- /dev/null
+++ b/server/licenses/lucene-spatial-extras-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+de787c052879893e47d21fa161c93413665d55d7
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.7.0.jar.sha1 b/server/licenses/lucene-spatial3d-9.7.0.jar.sha1
deleted file mode 100644
index 55d4d217fa6b9..0000000000000
--- a/server/licenses/lucene-spatial3d-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7c6b1b6e0a70c9cd177371e648648c2f896742a2
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.8.0-snapshot-4373c3b.jar.sha1 b/server/licenses/lucene-spatial3d-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..2b378438bfb14
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+7e541ed960a571f5d9a0ecff5c26fd5ca857581e
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.7.0.jar.sha1 b/server/licenses/lucene-suggest-9.7.0.jar.sha1
deleted file mode 100644
index d4d7e6cd6bed9..0000000000000
--- a/server/licenses/lucene-suggest-9.7.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5c37fd9a5d71dc87fe1cd4c18ff295ec8cfac170
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.8.0-snapshot-4373c3b.jar.sha1 b/server/licenses/lucene-suggest-9.8.0-snapshot-4373c3b.jar.sha1
new file mode 100644
index 0000000000000..1e3ed6561e3ef
--- /dev/null
+++ b/server/licenses/lucene-suggest-9.8.0-snapshot-4373c3b.jar.sha1
@@ -0,0 +1 @@
+4b222ef09a5f20896d031a8322f2e69304c16384
\ No newline at end of file
diff --git a/server/src/internalClusterTest/java/org/opensearch/search/functionscore/ExplainableScriptIT.java b/server/src/internalClusterTest/java/org/opensearch/search/functionscore/ExplainableScriptIT.java
index f67b913a75871..3651a7354e5de 100644
--- a/server/src/internalClusterTest/java/org/opensearch/search/functionscore/ExplainableScriptIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/search/functionscore/ExplainableScriptIT.java
@@ -179,8 +179,18 @@ public void testExplainScript() throws InterruptedException, IOException, Execut
         for (SearchHit hit : hits.getHits()) {
             assertThat(hit.getId(), equalTo(Integer.toString(idCounter)));
             assertThat(hit.getExplanation().toString(), containsString(Double.toString(idCounter)));
-            assertThat(hit.getExplanation().toString(), containsString("1 = n"));
-            assertThat(hit.getExplanation().toString(), containsString("1 = N"));
+
+            // Since Apache Lucene 9.8, the scores are not computed because script (see please ExplainableScriptPlugin)
+            // says "needs_score() == false"
+            // 19.0 = min of:
+            // 19.0 = This script returned 19.0
+            // 0.0 = _score:
+            // 0.0 = weight(text:text in 0) [PerFieldSimilarity], result of:
+            // 0.0 = score(freq=1.0), with freq of:
+            // 1.0 = freq, occurrences of term within document
+            // 3.4028235E38 = maxBoost
+
+            assertThat(hit.getExplanation().toString(), containsString("1.0 = freq, occurrences of term within document"));
             assertThat(hit.getExplanation().getDetails().length, equalTo(2));
             idCounter--;
         }
diff --git a/server/src/main/java/org/opensearch/search/suggest/completion/CompletionSuggester.java b/server/src/main/java/org/opensearch/search/suggest/completion/CompletionSuggester.java
index c7498635d2553..175503cb94e3d 100644
--- a/server/src/main/java/org/opensearch/search/suggest/completion/CompletionSuggester.java
+++ b/server/src/main/java/org/opensearch/search/suggest/completion/CompletionSuggester.java
@@ -116,6 +116,7 @@ private static void suggest(IndexSearcher searcher, CompletionQuery query, TopSu
                 }
             }
         }
+        collector.finish();
     }
 
     @Override