diff --git a/inventory/group_vars/mailservers b/inventory/group_vars/mailservers
index 6873021..7476027 100644
--- a/inventory/group_vars/mailservers
+++ b/inventory/group_vars/mailservers
@@ -1,6 +1,5 @@
 ---
 
 virtual_domain: tunuifranken.info
-server_admin: "dns@{{ virtual_domain }}"
-domain: "{{ ansible_hostname }}.{{ virtual_domain }}"
-foo: bar
+letsencrypt_email: "dns@{{ virtual_domain }}"
+letsencrypt_domain: "{{ ansible_hostname }}.{{ virtual_domain }}"
diff --git a/roles/add_cert_dns_01/tasks/main.yml b/roles/add_cert_dns_01/tasks/main.yml
index 61d7c90..e2092b0 100644
--- a/roles/add_cert_dns_01/tasks/main.yml
+++ b/roles/add_cert_dns_01/tasks/main.yml
@@ -37,9 +37,9 @@
       - --rsa-key-size
       - 4096
       - -d
-      - "{{ domain }}"
+      - "{{ letsencrypt_domain }}"
       - -m
-      - "{{ server_admin }}"
+      - "{{ letsencrypt_email }}"
       - --agree-tos
 
 - name: Set letsencrypt dns-01 challenge argv (staging)
@@ -51,7 +51,7 @@
   become: true
   ansible.builtin.command:
     argv: "{{ letsencrypt_dns01_challenge_argv }}"
-    creates: "/etc/letsencrypt/live/{{ domain }}"
+    creates: "/etc/letsencrypt/live/{{ letsencrypt_domain }}"
 
 - name: Create directory for certbot.service override
   become: true
diff --git a/roles/forgejo/tasks/main.yml b/roles/forgejo/tasks/main.yml
index 9070889..764e80a 100644
--- a/roles/forgejo/tasks/main.yml
+++ b/roles/forgejo/tasks/main.yml
@@ -3,8 +3,8 @@
   ansible.builtin.include_role:
     name: add_cert_dns_01
   vars:
-    server_admin: "{{ forgejo_server_admin }}"
-    domain: "{{ forgejo_domain }}"
+    letsencrypt_domain: "{{ forgejo_domain }}"
+    letsencrypt_email: "{{ forgejo_server_admin }}"
 
 - name: Include apache2 tasks
   ansible.builtin.include_tasks: apache2.yml
diff --git a/roles/tunuifranken/tasks/main.yml b/roles/tunuifranken/tasks/main.yml
index 41924c3..44aa181 100644
--- a/roles/tunuifranken/tasks/main.yml
+++ b/roles/tunuifranken/tasks/main.yml
@@ -3,8 +3,8 @@
   ansible.builtin.include_role:
     name: add_cert_dns_01
   vars:
-    domain: "{{ tunuifranken_domain }}"
-    server_admin: "{{ tunuifranken_server_admin }}"
+    letsencrypt_domain: "{{ tunuifranken_domain }}"
+    letsencrypt_email: "{{ tunuifranken_server_admin }}"
 
 - name: Create tunuifranken directory
   become: true