diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ec52a01..fa5acba1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -102,6 +102,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * webapps/nextcloud: fix misplaced gid attribute
 * webapps/nextcloud: fix missing gid
 * webapps/roundcube & evoadminmail: make roles more idempotent (were failing when played twice)
+* amavis: Add variables for generate "ldap_suffix" 
 
 ### Removed
 
diff --git a/amavis/defaults/main.yml b/amavis/defaults/main.yml
new file mode 100644
index 00000000..82f29666
--- /dev/null
+++ b/amavis/defaults/main.yml
@@ -0,0 +1,3 @@
+ldap_hostname: "{{ ansible_hostname }}"
+ldap_domain: "{{ ansible_domain }}"
+ldap_suffix: "dc={{ ldap_hostname }},dc={{ ldap_domain.split('.')[-2] }},dc={{ ldap_domain.split('.')[-1] }}"