diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 904399a3d7d..1af4e5af0d5 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 7.6.0
-lucene            = 8.4.0-snapshot-662c455
+lucene            = 8.4.0-snapshot-08b8d116f8f
 
 bundled_jdk_vendor = adoptopenjdk
 bundled_jdk = 13.0.1+9
diff --git a/modules/lang-expression/licenses/lucene-expressions-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..0f2b32ad7ef
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+a02eaef7b91b383f7ca43f4a33726bd089c0a36e
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-8.4.0-snapshot-662c455.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 1c4c5ce2b62..00000000000
--- a/modules/lang-expression/licenses/lucene-expressions-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4041db9db7c394584571b45812734732912ef8e2
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..058b07b9dba
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+7c7054c935661dde19afeb0b9c7b8bda65c0dafe
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.4.0-snapshot-662c455.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 0fc96bc500e..00000000000
--- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d5bddd6b7660439e29bbce26ded283931c756d75
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..decd6216aee
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+4dc8d6f78242fc384fd03a2a2e93d1737b0d3c11
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.4.0-snapshot-662c455.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 388bc9748b7..00000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4303858c346c51bbbc68c32eb25f7f372b09331c
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..3c34ab4664b
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+40baaa81cb2b986d086b0ebc648415da84c15552
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.4.0-snapshot-662c455.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 07ff7fd907a..00000000000
--- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b1a9182ed1b92a121c1587fe9710aa7a41f3f77a
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..623f9f1aefd
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+8739dcdb8ca9fdebb93f6e696626119d30d5cb58
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.4.0-snapshot-662c455.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 95e603ec188..00000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4df747b25286baecf5e790bf76bc40038c059691
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..4b4d838d03f
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+74a27bf3c523156fadc0159cd1311388505d6cae
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.4.0-snapshot-662c455.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 4eaf91f3083..00000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-88d3f8f9134b95884f3b80280b09aa2513b71297
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..f5510f6f731
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+374d411635868394719f4d328a26dbc6a9b0eded
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.4.0-snapshot-662c455.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index e28b8d87cd5..00000000000
--- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9ddccf575ee03a1329c8d1eb2e4ee7a6e3f3f56f
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..5c9510b0127
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+1cf79c772b6cfecc80137bcde48b7a5432ee5028
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.4.0-snapshot-662c455.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 1b8ec8c5831..00000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e115e562a42c12a3292fb138607855c1fdfb0772
\ No newline at end of file
diff --git a/server/licenses/lucene-analyzers-common-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/server/licenses/lucene-analyzers-common-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..03841938296
--- /dev/null
+++ b/server/licenses/lucene-analyzers-common-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+dc14a70f44c2597e237f37f096d6b8c2db8cd335
\ No newline at end of file
diff --git a/server/licenses/lucene-analyzers-common-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-analyzers-common-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index d6f8049f7b1..00000000000
--- a/server/licenses/lucene-analyzers-common-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-061fb94ab616492721f8868dcaec3fbc989733be
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/server/licenses/lucene-backward-codecs-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..76fbf985dc8
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+535e6d650fe66ef8df9fd03ad48170f6c0e7c4cf
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-backward-codecs-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 243c4420bea..00000000000
--- a/server/licenses/lucene-backward-codecs-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-503f3d516889a99e1c0e2dbdba7bf9cc9900c54c
\ No newline at end of file
diff --git a/server/licenses/lucene-core-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/server/licenses/lucene-core-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..cb9ce3f8db7
--- /dev/null
+++ b/server/licenses/lucene-core-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+2d20a2d0f96f4337665b3043e627df6ce83ed41c
\ No newline at end of file
diff --git a/server/licenses/lucene-core-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-core-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index d1657fccc5e..00000000000
--- a/server/licenses/lucene-core-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8ca36adea0a904ec725d57f509a62652a53ecff8
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/server/licenses/lucene-grouping-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..10b0df87881
--- /dev/null
+++ b/server/licenses/lucene-grouping-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+cb9218eb5a5c9ef84377f9533e8a2d13c55ed71b
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-grouping-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index f1f0684d9b3..00000000000
--- a/server/licenses/lucene-grouping-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f176fdcf8fc574f4cb1c549aaa4da0301afd34ba
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/server/licenses/lucene-highlighter-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..9ae147d34b6
--- /dev/null
+++ b/server/licenses/lucene-highlighter-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+0cbb63e519f3e0acf7bdbc6dcd6c2bc4bb003b70
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-highlighter-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index a9ad6fb95cb..00000000000
--- a/server/licenses/lucene-highlighter-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-db5ea7b647309e5d29fa92bcbb6b11286d11436d
\ No newline at end of file
diff --git a/server/licenses/lucene-join-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/server/licenses/lucene-join-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..59cb050fe46
--- /dev/null
+++ b/server/licenses/lucene-join-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+0f843b878752449f345d6fd5048f62b1c0688fca
\ No newline at end of file
diff --git a/server/licenses/lucene-join-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-join-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 6ef1d079f63..00000000000
--- a/server/licenses/lucene-join-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-36329bc2ea6a5640d4128206221456656de7bbe2
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/server/licenses/lucene-memory-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..78951b539c0
--- /dev/null
+++ b/server/licenses/lucene-memory-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+e5583564c96d24d7293574efbd5d55d5e5d55f58
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-memory-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index eeb42485102..00000000000
--- a/server/licenses/lucene-memory-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-083f492781b3d2c1d470bd1439c875ebf74a14eb
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/server/licenses/lucene-misc-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..86a36ef22e4
--- /dev/null
+++ b/server/licenses/lucene-misc-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+1a20042a3c79e86b0c95f7bc19bdb835e4fba74e
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-misc-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 6f5d479c76d..00000000000
--- a/server/licenses/lucene-misc-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9cd5ea7bc08d93053ca993bd6fc1c9cd0a1b91fd
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/server/licenses/lucene-queries-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..8e776691832
--- /dev/null
+++ b/server/licenses/lucene-queries-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+60f1ba706bde727fcbb333e8bc52d0cf53daa776
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-queries-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 30733a5a577..00000000000
--- a/server/licenses/lucene-queries-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-89e39f65d1c42b5849ccf3a8e6cc9b3b277c08a6
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/server/licenses/lucene-queryparser-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..eec0b037dfe
--- /dev/null
+++ b/server/licenses/lucene-queryparser-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+a99fbcf01d2ee081b04ed7e173c71bcc1f2c4a83
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-queryparser-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 98b065176a4..00000000000
--- a/server/licenses/lucene-queryparser-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-651f6a0075ee30b814c8b56020d95155424c0e67
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/server/licenses/lucene-sandbox-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..66881bedef5
--- /dev/null
+++ b/server/licenses/lucene-sandbox-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+613057333e965ada682126b7e97d8d7fb6ab7db8
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-sandbox-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 484ce6b5c00..00000000000
--- a/server/licenses/lucene-sandbox-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-935968488cc2bbcd3ced9c254f690e7c90447d9e
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/server/licenses/lucene-spatial-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..6b7f37fa766
--- /dev/null
+++ b/server/licenses/lucene-spatial-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+2727fc11cb9d503388a8fb09159de8db17772de9
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-spatial-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 1bb42417cb1..00000000000
--- a/server/licenses/lucene-spatial-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0bbdd0002d8d87e54b5caff6c77a1627bf449d38
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/server/licenses/lucene-spatial-extras-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..4c480aff42a
--- /dev/null
+++ b/server/licenses/lucene-spatial-extras-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+7bd96ac0db2bf246e8a5636409201fa1ca1619fe
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-spatial-extras-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 2bdbd889b44..00000000000
--- a/server/licenses/lucene-spatial-extras-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-255b547571dcec118ff1a0560bb16e259f96b76a
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/server/licenses/lucene-spatial3d-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..1bb87cc3f58
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+f4c57666b25335ff797c76932563b3f4e33f138d
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-spatial3d-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index e7036243119..00000000000
--- a/server/licenses/lucene-spatial3d-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-739af6d9876f6aa7f2a3d46fa3f236a5d6ee3653
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/server/licenses/lucene-suggest-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..31d4b678e05
--- /dev/null
+++ b/server/licenses/lucene-suggest-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+2351b9abaa5fed697217853db44c038070660b75
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-suggest-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index 72c92c101b0..00000000000
--- a/server/licenses/lucene-suggest-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-20fa11a541a7ca3a50caa443a9abf0276b1194ea
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.4.0-snapshot-08b8d116f8f.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.4.0-snapshot-08b8d116f8f.jar.sha1
new file mode 100644
index 00000000000..cb9ce3f8db7
--- /dev/null
+++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.4.0-snapshot-08b8d116f8f.jar.sha1
@@ -0,0 +1 @@
+2d20a2d0f96f4337665b3043e627df6ce83ed41c
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.4.0-snapshot-662c455.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.4.0-snapshot-662c455.jar.sha1
deleted file mode 100644
index d1657fccc5e..00000000000
--- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.4.0-snapshot-662c455.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8ca36adea0a904ec725d57f509a62652a53ecff8
\ No newline at end of file