diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index ee2ce1b8d67b3..2ffc9101b9d80 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 8.0.0
-lucene            = 8.5.0-snapshot-7f057455901
+lucene            = 8.5.0
 
 bundled_jdk_vendor = adoptopenjdk
 bundled_jdk = 14+36
diff --git a/modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-7f057455901.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 19c383c96f0a0..0000000000000
--- a/modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1219c9aca51a37ea3e22cf88ad2e8745d1a6e02f
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-8.5.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..ea1af2536868e
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-8.5.0.jar.sha1
@@ -0,0 +1 @@
+41fcbae8104c54487c83c002cf3da6a13065b7a4
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-7f057455901.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index f639c17a35f5a..0000000000000
--- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b6f880fa08a44fcb2d50808f9eeb6189a293ce27
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..c2f0eb182c26e
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0.jar.sha1
@@ -0,0 +1 @@
+0697a7b06e4447be330f093e62d863deaadabc8c
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-7f057455901.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 5c1e0b2f6fa43..0000000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9c5b8619795f69c225b5ec37b87cb34de0feccd4
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..9f20b12df3341
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0.jar.sha1
@@ -0,0 +1 @@
+b269efbdd16c28525942a27f5738c9d1348b6301
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-7f057455901.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 656f63c68d194..0000000000000
--- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-421e13b9fe09523e094ac708204d62d4ea5b6618
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..4ea0c218177ec
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0.jar.sha1
@@ -0,0 +1 @@
+056eef8f0a64a70cd9af070ecd8e17d33e55cb75
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-7f057455901.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 951d97032f9fb..0000000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ff4ae9f3f3b0bc497f98c9bc47e943525669fc99
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..b0e0f037d5571
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0.jar.sha1
@@ -0,0 +1 @@
+356e39f7b4b0cf8bc6a766a54ab6b93b11c89f6d
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-7f057455901.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 19846e43636c3..0000000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dd6430c037566cd3852b73b2ec31e59de24cfe58
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..faa11d7a87fb3
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0.jar.sha1
@@ -0,0 +1 @@
+6139d1cc3f51d6f5fc5ab9976dc5376b682d8332
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-7f057455901.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 147bbb3192d24..0000000000000
--- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dd4ca22b151a98a21e255bc1c54f0fadfee5ca4d
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..62fe533fde854
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0.jar.sha1
@@ -0,0 +1 @@
+f6c1757e23f0cbad2e4d2eb39a12d9deff2e802b
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-7f057455901.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 86cee0ecdd039..0000000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e85f94d2747ddb560af0bc4d15f0cde45cf3ff30
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..52115dc4ff819
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0.jar.sha1
@@ -0,0 +1 @@
+e647c3158a092df07ba4ac1b827623f45176ef48
\ No newline at end of file
diff --git a/server/licenses/lucene-analyzers-common-8.5.0-snapshot-7f057455901.jar.sha1 b/server/licenses/lucene-analyzers-common-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 242bbfc9bd604..0000000000000
--- a/server/licenses/lucene-analyzers-common-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0365c37a03123ee8e30f75e44a1cb7d5ddd2fc52
\ No newline at end of file
diff --git a/server/licenses/lucene-analyzers-common-8.5.0.jar.sha1 b/server/licenses/lucene-analyzers-common-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..398344daaa992
--- /dev/null
+++ b/server/licenses/lucene-analyzers-common-8.5.0.jar.sha1
@@ -0,0 +1 @@
+7156f2e545fd6e7faaee4781d15eb60cf5f07646
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-8.5.0-snapshot-7f057455901.jar.sha1 b/server/licenses/lucene-backward-codecs-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 056fe4a00cbb5..0000000000000
--- a/server/licenses/lucene-backward-codecs-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d56b30f75b2df92da8c6c0965ce72e7abb86347b
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-8.5.0.jar.sha1 b/server/licenses/lucene-backward-codecs-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..1f926add1ffa2
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-8.5.0.jar.sha1
@@ -0,0 +1 @@
+5837d9ec231b998d9eb75a99f3bf1dc9748c8f46
\ No newline at end of file
diff --git a/server/licenses/lucene-core-8.5.0-snapshot-7f057455901.jar.sha1 b/server/licenses/lucene-core-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index fe30b9975cab4..0000000000000
--- a/server/licenses/lucene-core-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-39933692162e28c2719b60f499204b28236a2858
\ No newline at end of file
diff --git a/server/licenses/lucene-core-8.5.0.jar.sha1 b/server/licenses/lucene-core-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..588b450154d09
--- /dev/null
+++ b/server/licenses/lucene-core-8.5.0.jar.sha1
@@ -0,0 +1 @@
+3f9ea85fff4fc3f7c83869dddb9b0ef7818c0cae
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-8.5.0-snapshot-7f057455901.jar.sha1 b/server/licenses/lucene-grouping-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index c3ef488e826f8..0000000000000
--- a/server/licenses/lucene-grouping-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2e56cc12d2f77d82946299b66f3416f9e621b2f3
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-8.5.0.jar.sha1 b/server/licenses/lucene-grouping-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..89c60926a4a82
--- /dev/null
+++ b/server/licenses/lucene-grouping-8.5.0.jar.sha1
@@ -0,0 +1 @@
+08d26d94f32b38d15eaf68b17bef52158e4bbc87
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-8.5.0-snapshot-7f057455901.jar.sha1 b/server/licenses/lucene-highlighter-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index cfa7fa961780b..0000000000000
--- a/server/licenses/lucene-highlighter-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5cddb5b65e7ead641483dcc2ffb0e50ad8d26eb7
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-8.5.0.jar.sha1 b/server/licenses/lucene-highlighter-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..9ec3d4b53fef0
--- /dev/null
+++ b/server/licenses/lucene-highlighter-8.5.0.jar.sha1
@@ -0,0 +1 @@
+8c653f47ea042dec2920bab83b039774b567eb9f
\ No newline at end of file
diff --git a/server/licenses/lucene-join-8.5.0-snapshot-7f057455901.jar.sha1 b/server/licenses/lucene-join-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 94a18fd3c3913..0000000000000
--- a/server/licenses/lucene-join-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cfabaedd80fe600cc7fda5ee12d90927fa96d87c
\ No newline at end of file
diff --git a/server/licenses/lucene-join-8.5.0.jar.sha1 b/server/licenses/lucene-join-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..fa153682841ab
--- /dev/null
+++ b/server/licenses/lucene-join-8.5.0.jar.sha1
@@ -0,0 +1 @@
+98713495a3f48558a5acd7aaa22bfa7da394e78a
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-8.5.0-snapshot-7f057455901.jar.sha1 b/server/licenses/lucene-memory-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index ae7da5c259f69..0000000000000
--- a/server/licenses/lucene-memory-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e90fbcc53531978fc03ef847ba396d4cdd89c7e4
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-8.5.0.jar.sha1 b/server/licenses/lucene-memory-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..402e037eb1a20
--- /dev/null
+++ b/server/licenses/lucene-memory-8.5.0.jar.sha1
@@ -0,0 +1 @@
+18e3ed87c7f29bb0fe4b5db244a4f31018a9e518
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-8.5.0-snapshot-7f057455901.jar.sha1 b/server/licenses/lucene-misc-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 8f6c2fe6d63c1..0000000000000
--- a/server/licenses/lucene-misc-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dd0b4cef132a50b3fa919f214a5316fcc78c46ea
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-8.5.0.jar.sha1 b/server/licenses/lucene-misc-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..fa96c7ab7e70c
--- /dev/null
+++ b/server/licenses/lucene-misc-8.5.0.jar.sha1
@@ -0,0 +1 @@
+9786e13764f55dbf28e71fe7e0a90d1e94bea0bc
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-8.5.0-snapshot-7f057455901.jar.sha1 b/server/licenses/lucene-queries-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 4b2a346309f3f..0000000000000
--- a/server/licenses/lucene-queries-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c90cc35089afc3f7802668c3969b5e7391b6d15a
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-8.5.0.jar.sha1 b/server/licenses/lucene-queries-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..ec92e3918b4d5
--- /dev/null
+++ b/server/licenses/lucene-queries-8.5.0.jar.sha1
@@ -0,0 +1 @@
+708c1f850ed70c506822b021a722e42f29c397a1
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-8.5.0-snapshot-7f057455901.jar.sha1 b/server/licenses/lucene-queryparser-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 3b5ec91e4f938..0000000000000
--- a/server/licenses/lucene-queryparser-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e324233cb8f069e4f6abcbab47368a83c3696f36
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-8.5.0.jar.sha1 b/server/licenses/lucene-queryparser-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..3fe3e5fc193b0
--- /dev/null
+++ b/server/licenses/lucene-queryparser-8.5.0.jar.sha1
@@ -0,0 +1 @@
+13c38f39b1a7d10c4749ba789fa95da5868d4885
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-8.5.0-snapshot-7f057455901.jar.sha1 b/server/licenses/lucene-sandbox-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 58d7518e7aefc..0000000000000
--- a/server/licenses/lucene-sandbox-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-985a451e5f564c84271419a446e044ab589d6f22
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-8.5.0.jar.sha1 b/server/licenses/lucene-sandbox-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..f36b8b978bede
--- /dev/null
+++ b/server/licenses/lucene-sandbox-8.5.0.jar.sha1
@@ -0,0 +1 @@
+2b275921f2fd92b15b4f1a2a565467c3fa221ef9
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-8.5.0-snapshot-7f057455901.jar.sha1 b/server/licenses/lucene-spatial-extras-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index f51b876ad5fdf..0000000000000
--- a/server/licenses/lucene-spatial-extras-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-beff7cafe0fa5330b9b915825b69321faf0fcaa9
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-8.5.0.jar.sha1 b/server/licenses/lucene-spatial-extras-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..02c7de2cd466f
--- /dev/null
+++ b/server/licenses/lucene-spatial-extras-8.5.0.jar.sha1
@@ -0,0 +1 @@
+a8603576227b03fa94c2cde81b877f711c8b4c3f
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-8.5.0-snapshot-7f057455901.jar.sha1 b/server/licenses/lucene-spatial3d-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 736c206ba1b48..0000000000000
--- a/server/licenses/lucene-spatial3d-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b9256d3a2a64d79435a4c726af8a3c28c2b77d7f
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-8.5.0.jar.sha1 b/server/licenses/lucene-spatial3d-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..df28d9295c4a0
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-8.5.0.jar.sha1
@@ -0,0 +1 @@
+6f05de532ca9497e4d8364addf123441b01372a8
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-8.5.0-snapshot-7f057455901.jar.sha1 b/server/licenses/lucene-suggest-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index 586728768c5b4..0000000000000
--- a/server/licenses/lucene-suggest-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f38949db273a910e94a57229db2d8f3e4aef5e1f
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-8.5.0.jar.sha1 b/server/licenses/lucene-suggest-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..b0abc5dc57319
--- /dev/null
+++ b/server/licenses/lucene-suggest-8.5.0.jar.sha1
@@ -0,0 +1 @@
+4ae6bea433acecbbaf7ae8fa3d56941ec2ad004d
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-7f057455901.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-7f057455901.jar.sha1
deleted file mode 100644
index fe30b9975cab4..0000000000000
--- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-7f057455901.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-39933692162e28c2719b60f499204b28236a2858
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0.jar.sha1
new file mode 100644
index 0000000000000..588b450154d09
--- /dev/null
+++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0.jar.sha1
@@ -0,0 +1 @@
+3f9ea85fff4fc3f7c83869dddb9b0ef7818c0cae
\ No newline at end of file