diff --git a/assets/internal/.cspell.json b/assets/internal/.cspell.json
index 44f95250d3b11682ba5c5fe5671d8c9dd108525b..85bca319aa9d54149bc09b95d0b2cb4f08a2893e 100644
--- a/assets/internal/.cspell.json
+++ b/assets/internal/.cspell.json
@@ -4,11 +4,6 @@
     "globRoot": ".",
     "minWordLength": 4,
     "dictionaries": [
-        "companies",
-        "fonts",
-        "html",
-        "php",
-        "softwareTerms",
         "allowed-words"
     ],
     "ignorePaths": [
diff --git a/scripts/prepare-cspell.php b/scripts/prepare-cspell.php
index 3b93d0be1993d8ada966a7dccebf1d627329b304..3b0859e10e02d358bf98ed3110ee81b222cd677b 100644
--- a/scripts/prepare-cspell.php
+++ b/scripts/prepare-cspell.php
@@ -110,12 +110,20 @@ $cspell_json['words'] = array_values(array_filter(array_unique(array_merge(
   $cspell_json['words'] ?? [],
   array_filter(explode(',', $words ?? '')),
   $module_name_parts,
-  // Add lando and ddev which appear in the original version of phpcs.xml.dist
-  // See https://www.drupal.org/project/gitlab_templates/issues/3427357#comment-15487034
+  // Add lando and ddev to cater for references to local docker integrations.
   ['lando', 'ddev'],
-  // Add some common words that were dropped from core dictionary in Drupal 11.1
+  // Add some common words that were dropped from core dictionaries.
   // See https://www.drupal.org/project/gitlab_templates/issues/3494834
-  ['endapply', 'nightwatchjs', 'testgroups'],
+  ['endapply', 'nightwatchjs', 'testgroup', 'testgroups', 'backlinks', 'mdhash', 'uploaders', 'vocabs'],
+  // Add Curl options and constants dropped from core dictionaries.
+  ['curlopt', 'returntransfer', 'curle', 'customrequest', 'failonerror', 'postfields', 'followlocation'],
+  // Add six phpcs sniff names/error codes that cannot be corrected.
+  // This can be removed if/when the core issue is resolved.
+  // See https://www.drupal.org/project/drupal/issues/3418190
+  [
+    'colourdefinitionsniff', 'seletorsingleline', 'teamplatespacingaftercomment', 'tforvalue', 'trhowscommentindentation',
+    'unecessaryfiledeclaration',
+  ],
 ))));
 $quiet ?: print '$cspell_json[\'words\']=' . print_r($cspell_json['words'], TRUE) . PHP_EOL;
 
@@ -213,6 +221,8 @@ $built_in_dictionaries = [
   'filetypes',
   'npm',
   'lorem-ipsum',
+  'sql',
+  'fullstack',
 ];
 $cspell_json['dictionaries'] = array_values(array_unique(array_merge(
   $cspell_json['dictionaries'] ?? [],