diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
index 05b896a..8b13789 100644
--- a/.github/actions/spelling/allow.txt
+++ b/.github/actions/spelling/allow.txt
@@ -1,5 +1 @@
-github
-hashicorp
-Terraform
-terraform
-cicd
+
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index cea49eb..2a9845c 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -1,10 +1,2 @@
 buildx
-checkbox
-ghcr
-Hashi
-KUBECONFIG
-Kubernetes
-mondoo
-mondoohq
-Mozilla
 myapp
diff --git a/.github/actions/spelling/line_forbidden.patterns b/.github/actions/spelling/line_forbidden.patterns
index 2542305..cf37f3f 100644
--- a/.github/actions/spelling/line_forbidden.patterns
+++ b/.github/actions/spelling/line_forbidden.patterns
@@ -7,6 +7,12 @@
 # s.b. GitLab
 \bGitlab\b
 
+# s.b. EventBridge
+\bEventbridge\b
+
+# s.b. CloudWatch
+\bCloudwatch\b
+
 # s.b. JavaScript
 \bJavascript\b
 
diff --git a/.github/workflows/spell-check.yaml b/.github/workflows/spell-check.yaml
index 345891e..0fad734 100644
--- a/.github/workflows/spell-check.yaml
+++ b/.github/workflows/spell-check.yaml
@@ -30,10 +30,13 @@ jobs:
           suppress_push_for_open_pull_request: 1
           checkout: true
           post_comment: 0
+          dictionary_source_prefixes: '{"mondoo": "https://raw.githubusercontent.com/mondoohq/spellcheck-dictionary/main/", "cspell": "https://raw.githubusercontent.com/check-spelling/cspell-dicts/v20220816/dictionaries/"}'
           extra_dictionaries: cspell:aws/aws.txt
             cspell:filetypes/filetypes.txt
-            cspell:software-terms/softwareTerms.txt
-            cspell:companies/companies.txt
+            cspell:software-terms/src/software-terms.txt
+            cspell:software-terms/src/software-tools.txt
+            cspell:companies/src/companies.txt
+            mondoo:mondoo_dictionary.txt
 
   comment:
     name: Report