diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst
index 432f73de9e8cdd7f7fd38c5e99f9b434fb1fd82c..4844b8049b2fff9c98561ac6e9f56b92a63ef4ae 100644
--- a/docs/source/glossary.rst
+++ b/docs/source/glossary.rst
@@ -3,6 +3,9 @@ Glossary of terms
 
 .. glossary::
 
+  AAI
+    Authentication and Authorisation Infrastructure
+
   API
     Application Programming Interface
 
@@ -23,9 +26,15 @@ Glossary of terms
   CRUD
     Create, Read, Update, Delete
 
+  DNS
+    Domain Name System
+
   FQDN
     Fully Quantified Domain Name
 
+  GAP
+    The GÉANT Automation Platform
+
   GSO
     GÉANT Service Orchestrator
 
@@ -42,6 +51,9 @@ Glossary of terms
   ISO
     International Organisation for Standardisation
 
+  JSON
+    JavaScript Object Notation
+
   LAG
     Link Aggregation: a bundle of multiple network connections.
 
@@ -69,6 +81,3 @@ Glossary of terms
 
   WFO
     `Workflow Orchestrator <https://workfloworchestrator.org/>`_
-
-  AAI
-    Authentication and Authorisation Infrastructure
diff --git a/docs/vale/styles/config/vocabularies/geant-jargon/accept.txt b/docs/vale/styles/config/vocabularies/geant-jargon/accept.txt
index 2b2d2a4f8b71a93a3dbce06687222161e1d1db01..af07d476da370b4fda5d5f2902f784731ae6d5d4 100644
--- a/docs/vale/styles/config/vocabularies/geant-jargon/accept.txt
+++ b/docs/vale/styles/config/vocabularies/geant-jargon/accept.txt
@@ -1,7 +1,12 @@
 GÉANT Automation Platform
+G[ÉE]ANT
 [GSO|gso]
+(GSO|gso)
+N(okia|OKIA)
+IMS
 Vereniging
-[[T|t]erminate|TERMINATE]
+[T|t]erminate
+TERMINATED?
 WFO
 Ansible
 [Dd]eprovision
@@ -9,12 +14,15 @@ API
 DNS
 dry_run
 Dark_fiber
-[A|a]ddress
-[I|i]ptrunk
-[A|a]llocate
+[Aa]ddress
+[Ii]ptrunk
+[Aa]llocate
 PHASE 1
 [Mm]odify
+FQDN
 AAI
-[M|m]iddleware
+[Mm]iddleware
 TWAMP
 Pydantic
+UUID
+SNMP