diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index c60f42dc1bb89..873cf7a721ac3 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 opensearch        = 3.0.0
-lucene            = 9.11.0-snapshot-8a555eb
+lucene            = 9.11.0-snapshot-fb97840
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 21.0.2+13
diff --git a/libs/core/licenses/lucene-core-9.11.0-snapshot-8a555eb.jar.sha1 b/libs/core/licenses/lucene-core-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 25beb34873c0c..0000000000000
--- a/libs/core/licenses/lucene-core-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fe1cf5663be8bdb6aa757fd4101bc551684c90fb
\ No newline at end of file
diff --git a/libs/core/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1 b/libs/core/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..88309bc46411a
--- /dev/null
+++ b/libs/core/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+53a828e3e88f55c83979cd3df0704617cc9edb9a
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-8a555eb.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 82a17e2b79290..0000000000000
--- a/modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-00759eaff8f62b38ba66a05f26ab784c268908d3
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-fb97840.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..f4da6e39aeeb8
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+ab914b48665f484315b78e4b6787aa42f5966bb6
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-8a555eb.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 0643f16dc1052..0000000000000
--- a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-44a4e095d7e047a9452d81b224905b72c830f8ae
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-fb97840.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..594733c11402c
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+f9cd7bec33c8cf3b891976cb674ffe9c97f8747f
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-8a555eb.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 3f4d49a78791b..0000000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7f57fe7322e6d3a9b4edcc3da0b1ee0791a814ec
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-fb97840.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..c46e06b8c87e4
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+c244a56bf7cd171a19379c96f1d20c477a34578d
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-8a555eb.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 1f110011ca9c6..0000000000000
--- a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9929da235100f8df323cfed165b8111fb2840093
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-fb97840.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..a79c34a127920
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+da26df43f2b0d7c2dfecbf208cae0772a5e382ca
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-8a555eb.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 8d6bf9fa0fa1b..0000000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8564c86d880c6ce002250002e2fd0936cbfff61d
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-fb97840.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..f2b08020be1ad
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+f752ffa5ee4697b04643214236138f3defdee2f4
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-8a555eb.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index cbe4aec98fae4..0000000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7e71777cfb5beb4ffd5b03030576d2f062eef13c
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-fb97840.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..969a05905eaf0
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+73fe44fe755aef72e7293b2ffdd934beb631429d
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-8a555eb.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index e1c7aecc104d0..0000000000000
--- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a597265bd6fb0a7e954e948a295d31507dd73cce
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-fb97840.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..fdf0bd39e217e
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+c2b48831b25e1c7e8f683a63d1505c2d133256d3
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-8a555eb.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index eefa2809f3540..0000000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c9e534845bb08985d7fa21e2e71a14bc68c46089
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-fb97840.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..0042415700453
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+757f8b29f103f82b6fb6948634e93dd497c9d7a8
\ No newline at end of file
diff --git a/server/build.gradle b/server/build.gradle
index cb48142a61159..a076a6bee36bf 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -411,14 +411,21 @@ tasks.register("downloadSnapshot", Copy) {
     def groupId = "org.opensearch"
     def artifactId = "opensearch"
 
-    repositories {
-        maven {
-            url mavenSnapshotRepoUrl
-        }
-    }
+    def repos = project.getRepositories();
+    MavenArtifactRepository opensearchRepo = repos.maven(repo -> {
+        repo.setName("opensearch-snapshots");
+        repo.setUrl(mavenSnapshotRepoUrl);
+    });
+
+    repos.exclusiveContent(exclusiveRepo -> {
+        exclusiveRepo.filter(descriptor -> descriptor.includeGroup(groupId));
+        exclusiveRepo.forRepositories(opensearchRepo);
+    });
 
     configurations {
-        snapshotArtifact
+        snapshotArtifact {
+            exclude group: 'org.apache.lucene'
+        }
     }
 
     dependencies {
diff --git a/server/licenses/lucene-analysis-common-9.11.0-snapshot-8a555eb.jar.sha1 b/server/licenses/lucene-analysis-common-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 9cab77f4e7394..0000000000000
--- a/server/licenses/lucene-analysis-common-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6f0cfa07a5e4b36423e398cd1fd51c6825773d9c
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-analysis-common-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..f229c373aa1af
--- /dev/null
+++ b/server/licenses/lucene-analysis-common-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+cd0afb5da5dcb4c7498bd1ee7f7bab0e289404b8
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.11.0-snapshot-8a555eb.jar.sha1 b/server/licenses/lucene-backward-codecs-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 2d5d1a281a0f0..0000000000000
--- a/server/licenses/lucene-backward-codecs-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ab201b997c8449db1ecd2fa88bd42d2f457286fa
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-backward-codecs-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..edaf28a7f6e76
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+88888315cd60e565960ae2e6fed2af0df077a2a2
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.11.0-snapshot-8a555eb.jar.sha1 b/server/licenses/lucene-core-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 25beb34873c0c..0000000000000
--- a/server/licenses/lucene-core-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fe1cf5663be8bdb6aa757fd4101bc551684c90fb
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..88309bc46411a
--- /dev/null
+++ b/server/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+53a828e3e88f55c83979cd3df0704617cc9edb9a
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.11.0-snapshot-8a555eb.jar.sha1 b/server/licenses/lucene-grouping-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 27d4f0f5874e9..0000000000000
--- a/server/licenses/lucene-grouping-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a988f92842e48195c75a49377432533c9170d93d
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-grouping-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..13f1276e3b033
--- /dev/null
+++ b/server/licenses/lucene-grouping-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+d1f54a816c9d85e890a862a2dffdc734ece2770c
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.11.0-snapshot-8a555eb.jar.sha1 b/server/licenses/lucene-highlighter-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 2545822f2ac7b..0000000000000
--- a/server/licenses/lucene-highlighter-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7c669e2c01565d3bdf175cd61a1e4d0bdfc44311
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-highlighter-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..6cef51ac4453f
--- /dev/null
+++ b/server/licenses/lucene-highlighter-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+1e7c9336fa86fb866fcd76ea5d6283c804b4d580
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.11.0-snapshot-8a555eb.jar.sha1 b/server/licenses/lucene-join-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index fe44ad772335f..0000000000000
--- a/server/licenses/lucene-join-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-633a6d44b4cde8e149daa3407e8b8f644eece951
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-join-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..2524ac35c2afe
--- /dev/null
+++ b/server/licenses/lucene-join-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+17be4fc1f9feca0dac84a37d54dca4b32df4c619
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.11.0-snapshot-8a555eb.jar.sha1 b/server/licenses/lucene-memory-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 85bfbe066ff56..0000000000000
--- a/server/licenses/lucene-memory-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-25390259c9e5592354efbc2f250bb396402016b2
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-memory-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..f5ef377300839
--- /dev/null
+++ b/server/licenses/lucene-memory-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+7350675a2cf386c0f003b667b61db614f03bb984
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.11.0-snapshot-8a555eb.jar.sha1 b/server/licenses/lucene-misc-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 4dba5837b66de..0000000000000
--- a/server/licenses/lucene-misc-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-056f87a3d30c223b08d2f45fe465ddf11210b85f
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-misc-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..e94fcf0f259a1
--- /dev/null
+++ b/server/licenses/lucene-misc-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+c5c8bd120d5985ab6bd4e5f89efe08c226c0a323
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.11.0-snapshot-8a555eb.jar.sha1 b/server/licenses/lucene-queries-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index b6b8c441eefb1..0000000000000
--- a/server/licenses/lucene-queries-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e640f850b4fb13190be8422fe74c14c9d6603bb5
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-queries-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..fc80394195fa9
--- /dev/null
+++ b/server/licenses/lucene-queries-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+2e1975ac26e9172722f734bf0f5583317e5eb16a
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.11.0-snapshot-8a555eb.jar.sha1 b/server/licenses/lucene-queryparser-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index d0e77b04db51a..0000000000000
--- a/server/licenses/lucene-queryparser-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8eb57762bf408fa51d7511f5e3b917627be61d1d
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-queryparser-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..10ef577bc1bdc
--- /dev/null
+++ b/server/licenses/lucene-queryparser-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+c8cf3d5dd4d0538b38e4e88bb865bc59d835d887
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.11.0-snapshot-8a555eb.jar.sha1 b/server/licenses/lucene-sandbox-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 179df9f07a594..0000000000000
--- a/server/licenses/lucene-sandbox-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-615b4a90c5402084c2d5916a4c1fadc9d9177782
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-sandbox-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..08a61ba30bc0d
--- /dev/null
+++ b/server/licenses/lucene-sandbox-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+5a3a7a138ff4978f3ddb186d9786e6cb4793b291
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-9.11.0-snapshot-8a555eb.jar.sha1 b/server/licenses/lucene-spatial-extras-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 9b88b24c21b12..0000000000000
--- a/server/licenses/lucene-spatial-extras-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-19b42cdb5f76f63dece3ef5128207ebdd3741d48
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-spatial-extras-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..a244219c1de60
--- /dev/null
+++ b/server/licenses/lucene-spatial-extras-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+dc71e0125c66d29a1bffc1ddeab4b96526e737c8
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.11.0-snapshot-8a555eb.jar.sha1 b/server/licenses/lucene-spatial3d-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 789ab1d52ea8c..0000000000000
--- a/server/licenses/lucene-spatial3d-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-882691fe917e716fe6bcf8c0dd984b153495d015
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-spatial3d-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..d2b3821bbf5f6
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+aef4c04d353092a438eee302521fe34188b7c4df
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.11.0-snapshot-8a555eb.jar.sha1 b/server/licenses/lucene-suggest-9.11.0-snapshot-8a555eb.jar.sha1
deleted file mode 100644
index 8cfaf60763724..0000000000000
--- a/server/licenses/lucene-suggest-9.11.0-snapshot-8a555eb.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ef6d483960f776d5dbdd1009863786ee09ba5707
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-suggest-9.11.0-snapshot-fb97840.jar.sha1
new file mode 100644
index 0000000000000..2c147e4651a44
--- /dev/null
+++ b/server/licenses/lucene-suggest-9.11.0-snapshot-fb97840.jar.sha1
@@ -0,0 +1 @@
+86f68cacd85f99b4ddcda3aff7c873349ba59381
\ No newline at end of file
diff --git a/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java
index c412ae8317f24..5231fe095f0f0 100644
--- a/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java
@@ -222,6 +222,9 @@ public abstract class AnalysisFactoryTestCase extends OpenSearchTestCase {
         .put("persianstem", Void.class)
         // https://github.com/apache/lucene/pull/12169
         .put("word2vecsynonym", Void.class)
+        // https://github.com/apache/lucene/pull/12915
+        .put("japanesehiraganauppercase", Void.class)
+        .put("japanesekatakanauppercase", Void.class)
         .immutableMap();
 
     static final Map<String, Class<?>> KNOWN_CHARFILTERS = new MapBuilder<String, Class<?>>()