diff --git a/defaults/main.yml b/defaults/main.yml
index 108c3d8..94e40d2 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -10,5 +10,4 @@ x11_keymap: de
 users:
   - vagrant
 sudoers:
-  - vagrant
-ensure_ansible_version: 2.10.3
\ No newline at end of file
+  - vagrant
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index cd239a5..ad18029 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -4,7 +4,6 @@
   become: true
   hostname:
     name: '{{ hostname }}'
-    use: systemd
   when: hostname and update_hostname == True
 
 - name: Firewall
@@ -24,20 +23,10 @@
   become: true
   when: ansible_facts['os_family'] == 'Debian'
 
-- name: Install basic packages (on Archlinux)
-  pacman:
-    name: "{{ packages }}"
-    state: present
-    #update_cache: yes
-  vars:
-    packages:
-      - python-pip
-      - htop
-      - tmux
-  become: yes
-  when: ansible_facts['os_family'] == 'Archlinux'
+- include: ansible-debian.yml
+  become: true
 
-- name: Install basic packages (on Debian)
+- name: Install basic packages
   apt:
     name: "{{ packages }}"
     state: present
@@ -49,7 +38,3 @@
       - tmux
   become: yes
   when: ansible_facts['os_family'] == 'Debian'
-
-- name: Install Ansible
-  pip:
-    name: ansible=={{ ensure_ansible_version }}
\ No newline at end of file
diff --git a/tasks/users.yml b/tasks/users.yml
index 5c38204..174f48f 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -21,8 +21,7 @@
     regexp: '^%wheel'
     line: '%wheel ALL=(ALL) NOPASSWD:ALL'
     validate: visudo -cf %s
-  when:
-    - ansible_facts['os_family'] in ['Debian', 'Archlinux']
+  when: ansible_facts['os_family'] == 'Debian'
 
 - name: 'Create users with corresponding groups'
   user: