diff --git a/ansible.cfg b/ansible.cfg
index 09970cc..e131c15 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,7 +1,7 @@
 [defaults]
 vault_password_file = get-vault-password.sh
 stdout_callback = yaml
-inventory = inventory.ini
+inventory = inventory/
 
 [ssh_connection]
 ssh_args = -o UserKnownHostsFile=known_hosts -F ssh_config
diff --git a/inventory/group_vars/mailservers b/inventory/group_vars/mailservers
new file mode 100644
index 0000000..6873021
--- /dev/null
+++ b/inventory/group_vars/mailservers
@@ -0,0 +1,6 @@
+---
+
+virtual_domain: tunuifranken.info
+server_admin: "dns@{{ virtual_domain }}"
+domain: "{{ ansible_hostname }}.{{ virtual_domain }}"
+foo: bar
diff --git a/inventory.ini b/inventory/hosts
similarity index 52%
rename from inventory.ini
rename to inventory/hosts
index e810edc..29416bc 100644
--- a/inventory.ini
+++ b/inventory/hosts
@@ -2,3 +2,11 @@ lime2
 lime2-test remote_user=vagrant
 mailserver
 mailserver-test remote_user=vagrant
+
+[lime2servers]
+lime2
+lime2-test
+
+[mailservers]
+mailserver
+mailserver-test
diff --git a/playbook_mailserver.yml b/playbook_mailserver.yml
index b96b998..5513b8f 100644
--- a/playbook_mailserver.yml
+++ b/playbook_mailserver.yml
@@ -5,15 +5,10 @@
 - name: Install mail server
   gather_facts: true
   hosts: mailserver,mailserver-test
-  vars:
-    virtual_domain: tunuifranken.info
   roles:
     - role: common_handlers
       tags: always
     - role: deploy_certificate
-      vars:
-        server_admin: "dns@{{ virtual_domain }}"
-        domain: "{{ ansible_hostname }}.{{ virtual_domain }}"
       tags: cert
     - role: mailserver_database
       tags: database