diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 8f7911574979d..a33da81bd7400 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 8.0.0
-lucene            = 8.1.0-snapshot-e460356abe
+lucene            = 8.1.0
 
 bundled_jdk       = 12.0.1+12@69cfe15208a647278a19ef0990eea691
 
diff --git a/modules/lang-expression/licenses/lucene-expressions-8.1.0-snapshot-e460356abe.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index 48446e877e309..0000000000000
--- a/modules/lang-expression/licenses/lucene-expressions-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0a1addebde14147501b7d24a581a7a7288bc585d
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-8.1.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..2554e8ce52652
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-8.1.0.jar.sha1
@@ -0,0 +1 @@
+0c98e3b9d25f27ab05ac643cfb28756daa516bc7
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.1.0-snapshot-e460356abe.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index c03380c6cf36c..0000000000000
--- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b8b7d744e6294706b379ec7fdd2d6f1b6badc95b
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.1.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..e4657681667f1
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.1.0.jar.sha1
@@ -0,0 +1 @@
+d61364290eb1c28696e62b7df3a7d041d3be2fa5
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.1.0-snapshot-e460356abe.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index e3195509e493f..0000000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c9dcc5568ccd4589f4a6871d2019661546106c83
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.1.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..fff37598a0861
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.1.0.jar.sha1
@@ -0,0 +1 @@
+7f78b18890a0a0e74a8249806a6cfcabd2fae304
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.1.0-snapshot-e460356abe.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index 77cd0b32ed9ea..0000000000000
--- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bef6d901a9c8b4c6139de7419b3024e0c9fd4ad3
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.1.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..47b0c633fdc79
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.1.0.jar.sha1
@@ -0,0 +1 @@
+bfc6b5d67a792aa23ee134fe93307696aad94223
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.1.0-snapshot-e460356abe.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index 1f090e9ca523f..0000000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-074c06d6f2254edae04acdd53bf6989a4343acc8
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.1.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..d24096b883fc9
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.1.0.jar.sha1
@@ -0,0 +1 @@
+6fac1ff799b86f872b67e7fad55120d338daa86f
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.1.0-snapshot-e460356abe.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index 42a1e22cdfbc0..0000000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5cd2a341ab4524ec7ff40ba29faa4ead5e805413
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.1.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..9ed51a53f6226
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.1.0.jar.sha1
@@ -0,0 +1 @@
+72941af5e1bfb012aec04dd518a2deb43402702c
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.1.0-snapshot-e460356abe.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index c2468bbdd7cac..0000000000000
--- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ba55aba7d278f6201b4ebd6dafbc7edb6fe94f8c
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.1.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..190a7031928b8
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.1.0.jar.sha1
@@ -0,0 +1 @@
+0ac885595cfdc0267d7d9cb843c22dabf7215ff0
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.1.0-snapshot-e460356abe.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index 176e9533edde9..0000000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-543d99fd2ba4302f3555792236350b201514d821
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.1.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..7f2d4c5e8647e
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.1.0.jar.sha1
@@ -0,0 +1 @@
+e260cff7f48e350e1ec037dec1c260ce05ddb53e
\ No newline at end of file
diff --git a/server/licenses/lucene-analyzers-common-8.1.0-snapshot-e460356abe.jar.sha1 b/server/licenses/lucene-analyzers-common-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index 08507536ac134..0000000000000
--- a/server/licenses/lucene-analyzers-common-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c20a8ae0c3bd769aa6c415ebea94ba466d9a631d
\ No newline at end of file
diff --git a/server/licenses/lucene-analyzers-common-8.1.0.jar.sha1 b/server/licenses/lucene-analyzers-common-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..6eb7722fec744
--- /dev/null
+++ b/server/licenses/lucene-analyzers-common-8.1.0.jar.sha1
@@ -0,0 +1 @@
+262f20cb2786cdf7015a4ba1a64ce90ff2d746f5
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-8.1.0-snapshot-e460356abe.jar.sha1 b/server/licenses/lucene-backward-codecs-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index 6b0a3854c6f38..0000000000000
--- a/server/licenses/lucene-backward-codecs-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6e8921ab37facdcc5c4b71f2612d72300d6de217
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-8.1.0.jar.sha1 b/server/licenses/lucene-backward-codecs-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..c232e0fbdfdb9
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-8.1.0.jar.sha1
@@ -0,0 +1 @@
+c5610306f8eff182b399b9aed7a60b82668a8395
\ No newline at end of file
diff --git a/server/licenses/lucene-core-8.1.0-snapshot-e460356abe.jar.sha1 b/server/licenses/lucene-core-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index fea3658cf61bd..0000000000000
--- a/server/licenses/lucene-core-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3e85f77d8f8ed1db53dba387fbdec55a9f912639
\ No newline at end of file
diff --git a/server/licenses/lucene-core-8.1.0.jar.sha1 b/server/licenses/lucene-core-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..4a6aa7b098686
--- /dev/null
+++ b/server/licenses/lucene-core-8.1.0.jar.sha1
@@ -0,0 +1 @@
+46d614acdeb42f4661e91347100217bc72aae11e
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-8.1.0-snapshot-e460356abe.jar.sha1 b/server/licenses/lucene-grouping-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index 0bcc1ebab16de..0000000000000
--- a/server/licenses/lucene-grouping-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-426a1822d888a6341f6bafccaad19e4a2ad88e25
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-8.1.0.jar.sha1 b/server/licenses/lucene-grouping-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..f3c49cb193aba
--- /dev/null
+++ b/server/licenses/lucene-grouping-8.1.0.jar.sha1
@@ -0,0 +1 @@
+443f63d9038eea0601b493fa37fc599d74b035eb
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-8.1.0-snapshot-e460356abe.jar.sha1 b/server/licenses/lucene-highlighter-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index b2478a52c7a85..0000000000000
--- a/server/licenses/lucene-highlighter-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f83fa4b264198dfb12436a803309a60f5588481d
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-8.1.0.jar.sha1 b/server/licenses/lucene-highlighter-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..6b174859e1834
--- /dev/null
+++ b/server/licenses/lucene-highlighter-8.1.0.jar.sha1
@@ -0,0 +1 @@
+e3e52591f8d44a4e1006ced4dd4a67f7a572990a
\ No newline at end of file
diff --git a/server/licenses/lucene-join-8.1.0-snapshot-e460356abe.jar.sha1 b/server/licenses/lucene-join-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index ea3f6353ce09e..0000000000000
--- a/server/licenses/lucene-join-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f381131abef51f77d26bccbb213d1c8563c19ec4
\ No newline at end of file
diff --git a/server/licenses/lucene-join-8.1.0.jar.sha1 b/server/licenses/lucene-join-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..75232f1fc0a72
--- /dev/null
+++ b/server/licenses/lucene-join-8.1.0.jar.sha1
@@ -0,0 +1 @@
+2e885b1e3e55f94ccc2744f85738563a577a4e21
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-8.1.0-snapshot-e460356abe.jar.sha1 b/server/licenses/lucene-memory-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index 0bc96c932c18b..0000000000000
--- a/server/licenses/lucene-memory-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8d8733551b9eb71e1f59688b8e78e0b481974d7a
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-8.1.0.jar.sha1 b/server/licenses/lucene-memory-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..4b2c65af32da5
--- /dev/null
+++ b/server/licenses/lucene-memory-8.1.0.jar.sha1
@@ -0,0 +1 @@
+e58d0092da1c4744627d57d022f4e07d8b80d11b
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-8.1.0-snapshot-e460356abe.jar.sha1 b/server/licenses/lucene-misc-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index fdde3da39a264..0000000000000
--- a/server/licenses/lucene-misc-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-13da0b22f01dff4a01c9907425464a440695104b
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-8.1.0.jar.sha1 b/server/licenses/lucene-misc-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..37afcfadb7e12
--- /dev/null
+++ b/server/licenses/lucene-misc-8.1.0.jar.sha1
@@ -0,0 +1 @@
+07833aee2c5feb6fa1a16a21d27c8f15c01d0b4c
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-8.1.0-snapshot-e460356abe.jar.sha1 b/server/licenses/lucene-queries-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index c50232482b5c1..0000000000000
--- a/server/licenses/lucene-queries-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6c3de4dbb98b5cc00875d76e817929374bb9e710
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-8.1.0.jar.sha1 b/server/licenses/lucene-queries-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..7f09849b67693
--- /dev/null
+++ b/server/licenses/lucene-queries-8.1.0.jar.sha1
@@ -0,0 +1 @@
+63096d40298b8b8245a602d344b57bfa14b929fd
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-8.1.0-snapshot-e460356abe.jar.sha1 b/server/licenses/lucene-queryparser-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index 4a6c53845fc24..0000000000000
--- a/server/licenses/lucene-queryparser-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-539ef199c74ae6891ac93f55632fe140b9d4c291
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-8.1.0.jar.sha1 b/server/licenses/lucene-queryparser-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..ada3ec974e031
--- /dev/null
+++ b/server/licenses/lucene-queryparser-8.1.0.jar.sha1
@@ -0,0 +1 @@
+9bb4fb3c7035a877e4a87ed86870894509d26d65
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-8.1.0-snapshot-e460356abe.jar.sha1 b/server/licenses/lucene-sandbox-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index 198b93230fb7c..0000000000000
--- a/server/licenses/lucene-sandbox-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0371141f658e2157babd490f0a8ddbcd5114b371
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-8.1.0.jar.sha1 b/server/licenses/lucene-sandbox-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..422195c73c69d
--- /dev/null
+++ b/server/licenses/lucene-sandbox-8.1.0.jar.sha1
@@ -0,0 +1 @@
+1033737c97703516134ba4c99d41724729854df4
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-8.1.0-snapshot-e460356abe.jar.sha1 b/server/licenses/lucene-spatial-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index ad6558f167d1c..0000000000000
--- a/server/licenses/lucene-spatial-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1bae56fbce29d6c597c00889dab1909f51f4aaac
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-8.1.0.jar.sha1 b/server/licenses/lucene-spatial-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..e0d8f362a1ecf
--- /dev/null
+++ b/server/licenses/lucene-spatial-8.1.0.jar.sha1
@@ -0,0 +1 @@
+968d2fb35b0c2e68ac07c1ec187ab38a74b6602a
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-8.1.0-snapshot-e460356abe.jar.sha1 b/server/licenses/lucene-spatial-extras-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index 66d5cc808a1ac..0000000000000
--- a/server/licenses/lucene-spatial-extras-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6eaed1dea9a18502ab9dffe55f081da6060373f7
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-8.1.0.jar.sha1 b/server/licenses/lucene-spatial-extras-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..0a45cfe117a3a
--- /dev/null
+++ b/server/licenses/lucene-spatial-extras-8.1.0.jar.sha1
@@ -0,0 +1 @@
+551b7fa327645d3fd59ae1321320153b2f858766
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-8.1.0-snapshot-e460356abe.jar.sha1 b/server/licenses/lucene-spatial3d-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index 0e1c69171e07e..0000000000000
--- a/server/licenses/lucene-spatial3d-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e54c6be78275637544a3080874dd04b0d92755e5
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-8.1.0.jar.sha1 b/server/licenses/lucene-spatial3d-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..9cdde5a308e22
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-8.1.0.jar.sha1
@@ -0,0 +1 @@
+45e63df708be458e95d9da3e6054189c50c30dff
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-8.1.0-snapshot-e460356abe.jar.sha1 b/server/licenses/lucene-suggest-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index 2d1491c40dd0d..0000000000000
--- a/server/licenses/lucene-suggest-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e4c95d0bb740f18af520faebcebb968da3e0a687
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-8.1.0.jar.sha1 b/server/licenses/lucene-suggest-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..c4ac6e68080ab
--- /dev/null
+++ b/server/licenses/lucene-suggest-8.1.0.jar.sha1
@@ -0,0 +1 @@
+d5cd0e619b473e132f03e3577d1b422f050f99c0
\ No newline at end of file
diff --git a/server/src/main/java/org/elasticsearch/index/codec/CodecService.java b/server/src/main/java/org/elasticsearch/index/codec/CodecService.java
index c43f733f916cb..485c40d5d9bbd 100644
--- a/server/src/main/java/org/elasticsearch/index/codec/CodecService.java
+++ b/server/src/main/java/org/elasticsearch/index/codec/CodecService.java
@@ -21,7 +21,6 @@
 
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.codecs.lucene50.Lucene50PostingsFormat.FSTLoadMode;
 import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat.Mode;
 import org.apache.lucene.codecs.lucene80.Lucene80Codec;
 import org.elasticsearch.common.Nullable;
@@ -49,7 +48,7 @@ public CodecService(@Nullable MapperService mapperService, Logger logger) {
         final var codecs = new HashMap<String, Codec>();
         if (mapperService == null) {
             codecs.put(DEFAULT_CODEC, new Lucene80Codec());
-            codecs.put(BEST_COMPRESSION_CODEC, new Lucene80Codec(Mode.BEST_COMPRESSION, FSTLoadMode.AUTO));
+            codecs.put(BEST_COMPRESSION_CODEC, new Lucene80Codec(Mode.BEST_COMPRESSION));
         } else {
             codecs.put(DEFAULT_CODEC,
                     new PerFieldMappingPostingFormatCodec(Mode.BEST_SPEED, mapperService, logger));
diff --git a/server/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java b/server/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java
index 705141f1fb925..4a154abd8eadd 100644
--- a/server/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java
+++ b/server/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java
@@ -22,7 +22,6 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.codecs.lucene50.Lucene50PostingsFormat.FSTLoadMode;
 import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat;
 import org.apache.lucene.codecs.lucene80.Lucene80Codec;
 import org.elasticsearch.common.lucene.Lucene;
@@ -48,7 +47,7 @@ public class PerFieldMappingPostingFormatCodec extends Lucene80Codec {
     }
 
     public PerFieldMappingPostingFormatCodec(Lucene50StoredFieldsFormat.Mode compressionMode, MapperService mapperService, Logger logger) {
-        super(compressionMode, FSTLoadMode.AUTO);
+        super(compressionMode);
         this.mapperService = mapperService;
         this.logger = logger;
     }
diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
index 82c4035cfa7db..db9de3765b1e7 100644
--- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
+++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
@@ -28,8 +28,6 @@
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.appender.AbstractAppender;
 import org.apache.logging.log4j.core.filter.RegexFilter;
-import org.apache.lucene.codecs.lucene50.Lucene50PostingsFormat;
-import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.LongPoint;
 import org.apache.lucene.document.NumericDocValuesField;
@@ -133,7 +131,6 @@
 import org.elasticsearch.test.IndexSettingsModule;
 import org.elasticsearch.test.VersionUtils;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -302,14 +299,6 @@ public void testSegments() throws Exception {
             assertThat(segments.get(0).getDeletedDocs(), equalTo(0));
             assertThat(segments.get(0).isCompound(), equalTo(true));
             assertThat(segments.get(0).ramTree, nullValue());
-            assertThat(segments.get(0).getAttributes().keySet(),
-                Matchers.contains(
-                    // TODO: Lucene50PostingsFormat#MODE_KEY should be public ?
-                    Lucene50PostingsFormat.class.getSimpleName() + ".fstMode",
-                    Lucene50StoredFieldsFormat.MODE_KEY
-                )
-            );
-
             engine.flush();
 
             segments = engine.segments(false);
diff --git a/server/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java b/server/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java
index 54d9a015b4e4a..5f730ad138f96 100644
--- a/server/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java
+++ b/server/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java
@@ -207,13 +207,13 @@ public void testExplainWithRewriteValidateQuery() throws Exception {
 
         // common terms queries
         assertExplanation(QueryBuilders.commonTermsQuery("field", "huge brown pidgin").cutoffFrequency(1),
-                containsString("+field:pidgin (field:huge field:brown)"), true);
+                containsString("+field:pidgin field:huge field:brown"), true);
         assertExplanation(QueryBuilders.commonTermsQuery("field", "the brown").analyzer("stop"),
                 containsString("field:brown"), true);
 
         // match queries with cutoff frequency
         assertExplanation(QueryBuilders.matchQuery("field", "huge brown pidgin").cutoffFrequency(1),
-                containsString("+field:pidgin (field:huge field:brown)"), true);
+                containsString("+field:pidgin field:huge field:brown"), true);
         assertExplanation(QueryBuilders.matchQuery("field", "the brown").analyzer("stop"),
                 containsString("field:brown"), true);
 
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.1.0-snapshot-e460356abe.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.1.0-snapshot-e460356abe.jar.sha1
deleted file mode 100644
index fea3658cf61bd..0000000000000
--- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.1.0-snapshot-e460356abe.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3e85f77d8f8ed1db53dba387fbdec55a9f912639
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.1.0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.1.0.jar.sha1
new file mode 100644
index 0000000000000..4a6aa7b098686
--- /dev/null
+++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.1.0.jar.sha1
@@ -0,0 +1 @@
+46d614acdeb42f4661e91347100217bc72aae11e
\ No newline at end of file