diff --git a/core/.cspell.json b/core/.cspell.json
index 9030c4bbaafdeabedf4c262bfeee8651141f8a64..1cba7aee114e656730f621f91c5312cdf9943eb4 100644
--- a/core/.cspell.json
+++ b/core/.cspell.json
@@ -44,10 +44,25 @@
       "\\Wi18n",
       "\\x{[0-9A-F]{4,5}}"
     ],
-    "dictionaries": ["drupal","companies", "fonts", "html", "php", "softwareTerms"],
-    "dictionaryDefinitions": [
-      { "name": "drupal", "path": "./misc/cspell/dictionary.txt"}
+    "dictionaries": [
+      "dictionary",
+      "drupal",
+      "companies",
+      "fonts",
+      "html",
+      "php",
+      "softwareTerms"
     ],
+    "dictionaryDefinitions": [
+      {
+        "name": "drupal",
+        "path": "./misc/cspell/drupal-dictionary.txt"
+      },
+      {
+        "name": "dictionary",
+        "path": "./misc/cspell/dictionary.txt"
+      }
+     ],
     "flagWords": [
       "e-mail",
       "grey",
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index 85517491f7ef8556b6e14ce8525e6b3ae0f380ea..f21ed4fb7ddebec89cda51058113f950ade54505 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -71,7 +71,6 @@ bakeware
 barbar
 barchart
 barqux
-bartik
 basefield
 basepath
 basestrings
@@ -82,7 +81,6 @@ bebebe
 beforeclose
 beforecreate
 behat
-behaviour
 bergmann
 berne
 bgblue
@@ -224,7 +222,6 @@ datestamp
 datetimeiso
 datetimeplus
 daycount
-dblog
 dbtng
 dburl
 dealerdirect
@@ -278,7 +275,6 @@ drivertext
 dropbutton
 dropbuttons
 drudbal
-drupalci
 drupaldatetime
 drupaldevdays
 drupalelementstyle
@@ -295,8 +291,6 @@ drupalmedia
 drupalmediaediting
 drupalmediatoolbar
 drupalorg
-druplicon
-drush
 drépal
 détruire
 editables
@@ -482,8 +476,6 @@ kthxbai
 kword
 labely
 lamoids
-langcode
-langcodes
 languageswitcher
 libc
 libmysqlclient
@@ -639,8 +631,6 @@ nyans
 nœud
 oembed
 officedocument
-olivero
-olivero's
 omittable
 onecol
 oneplusfourgrid
@@ -841,7 +831,6 @@ shortlink
 siema
 silverlight
 silvie
-simpletest
 singlebyte
 sirbrillig
 sisko
@@ -952,7 +941,6 @@ tbodies
 tcomment
 tempfile
 templating
-tempstore
 tempuser
 tercera
 testajax
@@ -1047,7 +1035,6 @@ tzid
 uberawesome
 uids
 ulwa
-umami
 unaliased
 unallowed
 unassigning
diff --git a/core/misc/cspell/drupal-dictionary.txt b/core/misc/cspell/drupal-dictionary.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6186bc3494ac39ba22fe7fc34fa81197d073f11e
--- /dev/null
+++ b/core/misc/cspell/drupal-dictionary.txt
@@ -0,0 +1,12 @@
+bartik
+dblog
+drupalci
+druplicon
+drush
+langcode
+langcodes
+olivero
+olivero's
+simpletest
+tempstore
+umami
diff --git a/core/package.json b/core/package.json
index 3258f29566dedbadb8ebd9422da25c7a70dc2608..d143673d1b5c0daa9cdddc331dd7436a23a18dbf 100644
--- a/core/package.json
+++ b/core/package.json
@@ -21,8 +21,9 @@
     "test:nightwatch": "node -r dotenv-safe/config ./node_modules/.bin/nightwatch --config ./tests/Drupal/Nightwatch/nightwatch.conf.js",
     "prettier": "prettier --write \"./**/*.js\"",
     "spellcheck": "cspell -c .cspell.json",
-    "spellcheck:make-drupal-dict": "rm -f misc/cspell/dictionary.txt && touch misc/cspell/dictionary.txt && yarn -s spellcheck:core --unique --words-only | perl -Mopen=locale -pe '$_=lc$_' | LC_ALL=en_US.UTF-8 tr -d \\\\\\\\ | LC_ALL=C sort -u -o misc/cspell/dictionary.txt",
+    "spellcheck:make-dict": "rm -f misc/cspell/dictionary.txt && touch misc/cspell/dictionary.txt && yarn -s spellcheck:core --unique --words-only | perl -Mopen=locale -pe '$_=lc$_' | LC_ALL=en_US.UTF-8 tr -d \\\\\\\\ | LC_ALL=C sort -u -o misc/cspell/dictionary.txt",
     "spellcheck:core": "cspell -c .cspell.json --root .. \"core/**/*\" \"composer/**/*\" \"composer.json\" \".gitlab-ci/*\" \".gitlab-ci.yml\"",
+    "spellcheck:make-drupal-dict": "rm -f misc/cspell/drupal-dictionary.txt && touch misc/cspell/drupal-dictionary.txt && yarn -s spellcheck:core --unique --words-only | perl -Mopen=locale -pe '$_=lc$_' | LC_ALL=en_US.UTF-8 tr -d \\\\\\\\ | LC_ALL=C sort -u -o misc/cspell/drupal-dictionary.txt",
     "vendor-update": "node ./scripts/js/vendor-update.js",
     "watch:ckeditor5": "webpack --config ./modules/ckeditor5/webpack.config.js --watch",
     "build:ckeditor5": "webpack --config ./modules/ckeditor5/webpack.config.js",
diff --git a/core/scripts/dev/commit-code-check.sh b/core/scripts/dev/commit-code-check.sh
index 2d47e0f950c5ddb43ec5989980907e26a4fc9c86..c82276083df58dc259e47ef7e6fb026cd8557061 100755
--- a/core/scripts/dev/commit-code-check.sh
+++ b/core/scripts/dev/commit-code-check.sh
@@ -176,7 +176,7 @@
     CKEDITOR5_PLUGINS_CHANGED=1;
   fi;
 
-  if [[ $FILE == "core/misc/cspell/dictionary.txt" || $FILE == "core/.cspell.json" ]]; then
+  if [[ $FILE == "core/misc/cspell/dictionary.txt" || $FILE == "core/misc/cspell/drupal-dictionary.txt" ]]; then
     CSPELL_DICTIONARY_FILE_CHANGED=1;
   fi
 done