diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
index 544cc47d4a9c0..f78a98f8dc827 100644
--- a/build-tools-internal/version.properties
+++ b/build-tools-internal/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 8.0.0
-lucene            = 9.0.0-snapshot-cfd9f9f98f7
+lucene            = 9.0.0-snapshot-8b68bf60c98
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 17+35
diff --git a/build.gradle b/build.gradle
index 60a2735f8cbe2..58168847859aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -142,8 +142,8 @@ String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull
  */
 
 if ( BuildParams.inFipsJvm ) {
-  bwc_tests_enabled = false
-  bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/issues/66772"
+  bwc_tests_enabled = true
+  bwc_tests_disabled_issue = ""
 }
 if (bwc_tests_enabled == false) {
   if (bwc_tests_disabled_issue.isEmpty()) {
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..d92d8f3fc6b2f
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+93676b57287ef17b5eda8f0ab5aa91ac27781b30
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index fe9352ca233c8..0000000000000
--- a/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3bc34dea0b46e0f6429b054f848e2611d6e1d3e7
\ No newline at end of file
diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..a3ea1b0fef522
--- /dev/null
+++ b/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+fabf62d18d45d4eb4e6199005f92624233b3f2e4
\ No newline at end of file
diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index 1c96b8e73ff65..0000000000000
--- a/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d9f8584667012bf09c446512ee25191b5d00ceed
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..19406d09ecf18
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+c5b251c26358225271e6901ae8e62f2b7b9a6e98
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index 8c6f53bfae64d..0000000000000
--- a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-91d7bb3e0f54577efbd08f8527ab705f76b405be
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..f40fc403c5530
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+07e69528347205991aa8b9724170c6bb4a61b0b0
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index dc92541178560..0000000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2e37f30126a2ddc0231b929b82b2bc2e120af1c2
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..3540eb801f1ae
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+f170e5a8a8105c7eb747ab77ee3a91247f1704b1
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index 0a00260a3592c..0000000000000
--- a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-efae6bf6515c2d767491b85a50946279f66e9836
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..308d0978017df
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+e1c03aa49d6dc9c5f194446ba1ac39504628456e
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index cf21023f7195d..0000000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e50a65b19d22bc98ca57a9426c45138c71787154
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..0e0de95bafd14
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+62b1dcdb25704edf95e634a810f8aa36aaac99ab
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index 4bfee0a4dabe1..0000000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6de256a78d4c8838d70f4b3720ba9fb6242a20bf
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..0fb07bd6f7352
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+10cf350a47eb30b615a7fd9bf740ad5e45017a2d
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index 2c7e1a52098af..0000000000000
--- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-48030e67171008e5d76fb211091a2bd4d256f097
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..04a4d5df07ded
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+839cd3dcb679d53239860f88a70c970a4b30c93a
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index 2d8b0dc4dd2a5..0000000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-21a775f1b3a2912c02ac64ceb23746b259694938
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-analysis-common-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..1d5734eb988f7
--- /dev/null
+++ b/server/licenses/lucene-analysis-common-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+0f73e4a59da39da41511bb960212398d82e64a97
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-analysis-common-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index 1475363327951..0000000000000
--- a/server/licenses/lucene-analysis-common-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5a90d530649b981da658ddda7889f1a3db2eec84
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-backward-codecs-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..773ae4902d257
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+ec67313245fcdb584b98790b6798a59f2f171f39
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-backward-codecs-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index f7ceb099c3bcd..0000000000000
--- a/server/licenses/lucene-backward-codecs-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-077984d39a5ffcdf1d3b6a41f0bc91352ad1a9a6
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..6815a521b7287
--- /dev/null
+++ b/server/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+6f5d5f4968f6e2f066a532d0c7a8ed0fbb9aec7d
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-core-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index d4cc15a3c336f..0000000000000
--- a/server/licenses/lucene-core-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9c2860726c0ce9a32b6c90976e2338e70c9ebfd2
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-grouping-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..08e04201d60ea
--- /dev/null
+++ b/server/licenses/lucene-grouping-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+2992847af15ee3b61b543bddd0e501f3fe178c6f
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-grouping-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index 133859fb80755..0000000000000
--- a/server/licenses/lucene-grouping-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d97143f3691c72d62ca591df230399addccc93e7
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-highlighter-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..dffe5d7260c5a
--- /dev/null
+++ b/server/licenses/lucene-highlighter-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+530f39370fc0c7b6bc837d3232204670ac62c8e1
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-highlighter-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index aa29f011018c0..0000000000000
--- a/server/licenses/lucene-highlighter-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-22b9996fab3f8cc167c3aa0015f859efc5dd5de3
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-join-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..9f21794438d0b
--- /dev/null
+++ b/server/licenses/lucene-join-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+7368570d058183ccc3d1c5e1d62750ade07162da
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-join-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index 1d1bed7d380bf..0000000000000
--- a/server/licenses/lucene-join-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b1b1b6efd48c353ea930cc159ed526821ae80551
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-memory-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..6b660dbcc30bb
--- /dev/null
+++ b/server/licenses/lucene-memory-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+148d1bb8a7ff899d082a03e3fab3004e270603c1
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-memory-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index 0382d46d7faf4..0000000000000
--- a/server/licenses/lucene-memory-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ab2cb78c651898e51060d0858ce96cc390cbc951
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-misc-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..f76923a9ce965
--- /dev/null
+++ b/server/licenses/lucene-misc-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+920bc15625ec49f1656cde591a071f4798974158
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-misc-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index 26ae55e13363d..0000000000000
--- a/server/licenses/lucene-misc-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f94f74e9f491fb2d3bed9f71ac39d9f7047731d5
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-queries-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..9fb827c8b5c01
--- /dev/null
+++ b/server/licenses/lucene-queries-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+61561472420037e0cead34ac14cc93ec948ddca5
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-queries-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index 839fdc438bfb7..0000000000000
--- a/server/licenses/lucene-queries-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a7fe8b44115414a6514020174b7d75c274492100
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-queryparser-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..ae5c8276a7e67
--- /dev/null
+++ b/server/licenses/lucene-queryparser-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+e90bbf2465f7f7fc1c606076d17a69bf7b455439
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-queryparser-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index b95ccbc6c9523..0000000000000
--- a/server/licenses/lucene-queryparser-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-198eed372135943e6971ba78682208944a9386ae
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-sandbox-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..c6ba51b1055c3
--- /dev/null
+++ b/server/licenses/lucene-sandbox-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+e67b37e3d5e6fa59eef529f5a24598958006de7e
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-sandbox-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index e33b961389be8..0000000000000
--- a/server/licenses/lucene-sandbox-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-95798905cae9f4f60b4a6f8d8c3e18e59b9e89a8
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-spatial3d-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..d4009aa5f5e24
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+062e6ecea21b4281d720910e486ed04012ae8b18
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-spatial3d-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index 37ad81feecd1f..0000000000000
--- a/server/licenses/lucene-spatial3d-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7e3c6993f306f94618a54ae1afa7cfe75ee7c4ee
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-suggest-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..eb5311d0b1856
--- /dev/null
+++ b/server/licenses/lucene-suggest-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+ade0398fa44d77e59842e40f76ec2910be1f5492
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/server/licenses/lucene-suggest-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index 08e578d7f1186..0000000000000
--- a/server/licenses/lucene-suggest-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1a0f9ecd3b487f93fad3d9b6817e9865b49e01eb
\ No newline at end of file
diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java
index 3c371e59d2a90..e35e1f2ee9afe 100644
--- a/server/src/main/java/org/elasticsearch/Version.java
+++ b/server/src/main/java/org/elasticsearch/Version.java
@@ -91,7 +91,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_7_15_0 = new Version(7150099, org.apache.lucene.util.Version.LUCENE_8_9_0);
     public static final Version V_7_15_1 = new Version(7150199, org.apache.lucene.util.Version.LUCENE_8_9_0);
     public static final Version V_7_15_2 = new Version(7150299, org.apache.lucene.util.Version.LUCENE_8_9_0);
-    public static final Version V_7_16_0 = new Version(7160099, org.apache.lucene.util.Version.LUCENE_8_10_0);
+    public static final Version V_7_16_0 = new Version(7160099, org.apache.lucene.util.Version.LUCENE_8_10_1);
     public static final Version V_8_0_0 = new Version(8000099, org.apache.lucene.util.Version.LUCENE_9_0_0);
     public static final Version CURRENT = V_8_0_0;
 
diff --git a/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java b/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java
index 8e9f19a8b418f..19258b6f9c65c 100644
--- a/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java
+++ b/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java
@@ -44,7 +44,7 @@ public void testRamBytesUsed() throws Exception {
                 map.putIndexUnderLock(uid.toBytesRef(), randomIndexVersionValue());
             }
         }
-        long actualRamBytesUsed = RamUsageTester.sizeOf(map);
+        long actualRamBytesUsed = RamUsageTester.ramUsed(map);
         long estimatedRamBytesUsed = map.ramBytesUsed();
         // less than 50% off
         assertEquals(actualRamBytesUsed, estimatedRamBytesUsed, actualRamBytesUsed / 2);
@@ -60,7 +60,7 @@ public void testRamBytesUsed() throws Exception {
                 map.putIndexUnderLock(uid.toBytesRef(), randomIndexVersionValue());
             }
         }
-        actualRamBytesUsed = RamUsageTester.sizeOf(map);
+        actualRamBytesUsed = RamUsageTester.ramUsed(map);
         estimatedRamBytesUsed = map.ramBytesUsed();
         long tolerance;
         if (Constants.JRE_IS_MINIMUM_JAVA9) {
diff --git a/server/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java b/server/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java
index dfb41dd18c0ad..7f9c3ab155bab 100644
--- a/server/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java
+++ b/server/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java
@@ -20,12 +20,12 @@ public void testIndexRamBytesUsed() {
             translogLoc = new Translog.Location(randomNonNegativeLong(), randomNonNegativeLong(), randomInt());
         }
         IndexVersionValue versionValue = new IndexVersionValue(translogLoc, randomLong(), randomLong(), randomLong());
-        assertEquals(RamUsageTester.sizeOf(versionValue), versionValue.ramBytesUsed());
+        assertEquals(RamUsageTester.ramUsed(versionValue), versionValue.ramBytesUsed());
     }
 
     public void testDeleteRamBytesUsed() {
         DeleteVersionValue versionValue = new DeleteVersionValue(randomLong(), randomLong(), randomLong(), randomLong());
-        assertEquals(RamUsageTester.sizeOf(versionValue), versionValue.ramBytesUsed());
+        assertEquals(RamUsageTester.ramUsed(versionValue), versionValue.ramBytesUsed());
     }
 
 }
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1
new file mode 100644
index 0000000000000..6815a521b7287
--- /dev/null
+++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1
@@ -0,0 +1 @@
+6f5d5f4968f6e2f066a532d0c7a8ed0fbb9aec7d
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-cfd9f9f98f7.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
deleted file mode 100644
index d4cc15a3c336f..0000000000000
--- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-cfd9f9f98f7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9c2860726c0ce9a32b6c90976e2338e70c9ebfd2
\ No newline at end of file