diff --git a/all/common/tasks/main.yml b/all/common/tasks/main.yml
index 2b462f99bde60c422fbc304ef9b83b1772dfc12a..24d3070f95eb5ef8e5b2dc5e895968b43ff37c34 100644
--- a/all/common/tasks/main.yml
+++ b/all/common/tasks/main.yml
@@ -6,11 +6,12 @@
 
 - name: install apt-transport-https packages before adding sources
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
     state: present
-  with_items:
-    - apt-transport-https
+  vars:
+    packages:
+      - apt-transport-https
 
 - name: add debian repo keys (id)
   apt_key:
@@ -31,14 +32,15 @@
 
 - name: install common packages
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
     state: present
-  with_items:
-    - vim
-    - wget
-    - psmisc
-    - tree
+  vars:
+    packages:
+      - vim
+      - wget
+      - psmisc
+      - tree
 
 - name: deploy sshd config
   template: src=sshd_config.j2 dest=/etc/ssh/sshd_config
diff --git a/common/borgbackup/tasks/main.yml b/common/borgbackup/tasks/main.yml
index 48cbf113856d8d4a0543ad0193ae42cf8862bc9b..fa986d951764a3e2cd4118299fe2857ab0cea49d 100644
--- a/common/borgbackup/tasks/main.yml
+++ b/common/borgbackup/tasks/main.yml
@@ -2,14 +2,15 @@
 # Pakete installieren
 - name: pakete installieren
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
     state: present
-  with_items:
-    - borgbackup
-    - logrotate
-    - moreutils
-    - openssl
+  vars:
+    packages:
+      - borgbackup
+      - logrotate
+      - moreutils
+      - openssl
 
 - name: create directory
   file: 
diff --git a/common/borgserver/tasks/main.yml b/common/borgserver/tasks/main.yml
index be7ada439516395bc80f1f44cee0314e2dbe8c59..274f191666ca0ec2e5b17cb6fc94c1b067ac4d44 100644
--- a/common/borgserver/tasks/main.yml
+++ b/common/borgserver/tasks/main.yml
@@ -2,11 +2,12 @@
 # Pakete installieren
 - name: pakete installieren
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
     state: present
-  with_items:
-    - borgbackup
+  vars:
+    packages:
+      - borgbackup
 
 # User for private backups 
 - name: create backup user account
diff --git a/common/docker/tasks/main.yml b/common/docker/tasks/main.yml
index 797d8e3d6115cdf5b4c26a2765b9f82a6f732f52..8dd5fe0b6c8e354e11e52bdcd1ecd83c698991c8 100644
--- a/common/docker/tasks/main.yml
+++ b/common/docker/tasks/main.yml
@@ -2,13 +2,14 @@
 
 - name: install deb packages
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
     state: present
-  with_items:
-    - docker-ce
-    - python 
-    - python-pip
+  vars:
+    packages:
+      - docker-ce
+      - python 
+      - python-pip
     
 - name: uninstall pip packages
   pip: 
@@ -17,9 +18,10 @@
 
 - name: install pip packages
   pip: 
-    name: "{{ item }}"
+    name: "{{ packages }}"
     state: present
-  with_items:
-    - docker
-    - docker-compose 
+  vars:
+    packages:
+      - docker
+      - docker-compose 
 
diff --git a/common/telegraf/tasks/main.yml b/common/telegraf/tasks/main.yml
index a20dbc13b80c4ca84ced809b2defe1eb2c656271..d0f5c52df20d433ff246d0ae1b8fe9ffb88f9b7a 100644
--- a/common/telegraf/tasks/main.yml
+++ b/common/telegraf/tasks/main.yml
@@ -2,21 +2,23 @@
 # Pakete installieren
 - name: pakete installieren
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
     state: present
-  with_items:
-    - telegraf
+  vars:
+    packages:
+      - telegraf
 
 - name: pakete installieren (host_type = physical)
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
     state: present
-  with_items:
-    - hddtemp
-    - lm-sensors
-    - smartmontools
+  vars:
+    packages:
+      - hddtemp
+      - lm-sensors
+      - smartmontools
   when: host_type == 'physical'
 
 
diff --git a/vorstand/git/tasks/main.yml b/vorstand/git/tasks/main.yml
index 74b1d5a6fbd3ce0b89d90b0bb282375825a56887..588f0f3d24b35a9502c68fc7c19ff3405f6273ec 100644
--- a/vorstand/git/tasks/main.yml
+++ b/vorstand/git/tasks/main.yml
@@ -3,11 +3,12 @@
 # Pakete installieren
 - name: git installieren
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
     state: present
-  with_items:
-    - git
+  vars:
+    packages:
+      - git
 
 
 # Git Repo für Verwaltungsdaaten 
diff --git a/vorstand/jameica/tasks/main.yml b/vorstand/jameica/tasks/main.yml
index 0f9f69e9e5bbd2ddabd306592cfed54b13a93721..14b139f17b92e8201ebf88638f8390b01303e9c8 100644
--- a/vorstand/jameica/tasks/main.yml
+++ b/vorstand/jameica/tasks/main.yml
@@ -2,13 +2,14 @@
 # Pakete installieren
 - name: notwendige pakete installieren
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
-    state: installed
-  with_items:
-    - python
-    - python-mysqldb
-    - openjdk-8-jre
+    state: present
+  vars:
+    packages:
+      - python
+      - python-mysqldb
+      - openjdk-8-jre
 
 # Get secrets 
 - include: ../functions/get_secret.yml
diff --git a/vorstand/x2goserver/tasks/main.yml b/vorstand/x2goserver/tasks/main.yml
index a8eeb4a1c5419e8f80d84c46598cae42f22e838c..4ec234c43ab5026b2eba7489e460f58555416a8b 100644
--- a/vorstand/x2goserver/tasks/main.yml
+++ b/vorstand/x2goserver/tasks/main.yml
@@ -1,8 +1,10 @@
 
 - name: install X2go Server  
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
-    state: installed
-  with_items:
-    - x2goserver
+    state: present
+  vars:
+    packages:
+      - x2goserver
+
diff --git a/warphab/homegear/tasks/main.yml b/warphab/homegear/tasks/main.yml
index 06f521920ad9ebac09210e9ad9c0e009fc1120f7..300a8765b4a6adb5fff703314d363337c76e1a09 100644
--- a/warphab/homegear/tasks/main.yml
+++ b/warphab/homegear/tasks/main.yml
@@ -3,15 +3,16 @@
 # Pakete für homegear und Nodejs installieren 
 - name: install packages
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
     state: present
-  with_items:
-    - homegear 
-    - homegear-max
-    - nodejs 
-    - npm
   notify: restart homegear
+  vars:
+    packages:
+      - homegear 
+      - homegear-max
+      - nodejs 
+      - npm
 
 # Homematic Manager über npm Installieren 
 # Der Homematic Manager ist nicht als Systemdienst installiert 
diff --git a/warphab/openhab/tasks/main.yml b/warphab/openhab/tasks/main.yml
index dc7e0ad69635129186edca7579f78cfe656ccb33..2319e24db8275489c6db0744ac4a670b262f49f9 100644
--- a/warphab/openhab/tasks/main.yml
+++ b/warphab/openhab/tasks/main.yml
@@ -2,13 +2,14 @@
 
 - name: install packages
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
     state: present
-  with_items:
-    - oracle-java8-jdk
-    - openhab2-offline 
   notify: restart openhab
+  vars:
+    packages:
+      - oracle-java8-jdk
+      - openhab2-offline 
 
 - name: enable service 
   service: 
diff --git a/warpsrvint/nginx/tasks/main.yml b/warpsrvint/nginx/tasks/main.yml
index 33e39386084a2148fe210d87b7e21ec05ced3eee..a7371889f4bf272591e7e6cf1aaace9815df0632 100644
--- a/warpsrvint/nginx/tasks/main.yml
+++ b/warpsrvint/nginx/tasks/main.yml
@@ -1,13 +1,14 @@
 # Pakete installieren
 - name: nginx installieren
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
     state: present
-  with_items:
-    - nginx
-    - git
-    - openssl
+  vars:
+    packages:
+      - nginx
+      - git
+      - openssl
 
 - name: nginx default Konfig entfernen 
   file: 
diff --git a/webserver/nginx/tasks/main.yml b/webserver/nginx/tasks/main.yml
index 35a2d6b265b675b1d80914d32b12ea4d9b7ab36c..2e9f058854893080ca1b2a07d7b2484f51809070 100644
--- a/webserver/nginx/tasks/main.yml
+++ b/webserver/nginx/tasks/main.yml
@@ -1,19 +1,20 @@
 # Pakete installieren
 - name: nginx installieren
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
     state: present
-  with_items:
-    - nginx
-    - git
-    - ca-certificates 
-    - gcc
-    - libssl-dev 
-    - libffi-dev
-    - python
-    - python-dev
-    - virtualenv
+  vars:
+    packages:
+      - nginx
+      - git
+      - ca-certificates 
+      - gcc
+      - libssl-dev 
+      - libffi-dev
+      - python
+      - python-dev
+      - virtualenv
 
 - name: nginx default Konfig entfernen 
   file: 
diff --git a/webserver/openvpn/tasks/main.yml b/webserver/openvpn/tasks/main.yml
index 153f2794e735559c9651b74b455f82ad771a9eb2..9e78e87cb232f55b592f5c10a5c21b1e872d8b51 100644
--- a/webserver/openvpn/tasks/main.yml
+++ b/webserver/openvpn/tasks/main.yml
@@ -1,11 +1,12 @@
 # Pakete installieren
 - name: openvpn installieren
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
     state: present
-  with_items:
-    - openvpn
+  vars:
+    packages:
+      - openvpn
 
 # Log-Verzeichnis erstellen