diff --git a/all/common/tasks/main.yml b/all/common/tasks/main.yml
index 5a61317b9bb5e966a2ed8ebd2478e01745d567ff..45d2461b0ca1a357f5488200f06a809df2385a6e 100644
--- a/all/common/tasks/main.yml
+++ b/all/common/tasks/main.yml
@@ -45,6 +45,7 @@
       - wget
       - psmisc
       - tree
+      - tmux 
 
 - name: deploy sshd config
   template: src=sshd_config.j2 dest=/etc/ssh/sshd_config
diff --git a/common/docker/tasks/main.yml b/common/docker/tasks/main.yml
index 8dd5fe0b6c8e354e11e52bdcd1ecd83c698991c8..08757f87394f8b7dc0ef0edff7a2bfa19f9503fc 100644
--- a/common/docker/tasks/main.yml
+++ b/common/docker/tasks/main.yml
@@ -8,20 +8,7 @@
   vars:
     packages:
       - docker-ce
+      - docker-compose
       - python 
       - python-pip
     
-- name: uninstall pip packages
-  pip: 
-    name: docker-py
-    state: absent
-
-- name: install pip packages
-  pip: 
-    name: "{{ packages }}"
-    state: present
-  vars:
-    packages:
-      - docker
-      - docker-compose 
-
diff --git a/host_vars/verwaltung b/host_vars/verwaltung
index 794f37c8455e2dd5c1a814f53786e352c9bb9c0d..1c3e105fe2995341a09aff09193439f6de88e0fb 100644
--- a/host_vars/verwaltung
+++ b/host_vars/verwaltung
@@ -6,18 +6,14 @@ motd_lines:
   - "Öffentliche IPs: {{ansible_ens3.ipv4.address}} / {{ansible_ens3.ipv6[0].address}}"
 
 debian_sources: 
-  - "deb http://repo.myloc.de/debian stretch main non-free contrib"
-  - "deb https://download.docker.com/linux/debian stretch stable"
-  - "deb http://packages.x2go.org/debian stretch main"
-  - "deb https://repos.influxdata.com/debian stretch stable"
-
+  - "deb http://ftp.halifax.rwth-aachen.de/debian/ buster main contrib non-free"
+  - "deb http://security.debian.org/ buster/updates main contrib non-free"
+  - "deb https://download.docker.com/linux/debian buster stable"
 
 debian_keys_id:
-  - "E1F958385BFE2B6E" # x2go repo key
   
 debian_keys_url:
   - "https://download.docker.com/linux/debian/gpg"
-  - "https://repos.influxdata.com/influxdb.key"
 
 
 # Primäre IP Adressen des Hosts 
@@ -49,6 +45,7 @@ openvpn_clients:
 
 
 administratorenteam:
+  - "void"
   - "sandhome"
   - "h3rb3rn"
 
diff --git a/host_vars/webserver b/host_vars/webserver
index f4780627ec99255bb49adcf0e393cb04e8d33729..d3d904c24ea9a26e441ef77110e670748ed601af 100644
--- a/host_vars/webserver
+++ b/host_vars/webserver
@@ -6,18 +6,14 @@ motd_lines:
   - "Öffentliche IPs: {{ansible_ens3.ipv4.address}} / {{ansible_ens3.ipv6[0].address}}"
 
 debian_sources: 
-  - "deb http://ftp.halifax.rwth-aachen.de/debian/ stretch main contrib non-free"
-  - "deb http://security.debian.org/ stretch/updates main contrib non-free"
-  - "deb http://ftp.de.debian.org/debian/ stretch-updates main"
-  - "deb http://ftp.halifax.rwth-aachen.de/debian/ stretch-updates main contrib non-free"
-  - "deb https://download.docker.com/linux/debian stretch stable"
-  - "deb https://repos.influxdata.com/debian stretch stable"
+  - "deb http://ftp.halifax.rwth-aachen.de/debian/ buster main contrib non-free"
+  - "deb http://security.debian.org/ buster/updates main contrib non-free"
+  - "deb https://download.docker.com/linux/debian buster stable"
 
 debian_keys_id:
 
 debian_keys_url:
   - "https://download.docker.com/linux/debian/gpg"
-  - "https://repos.influxdata.com/influxdb.key"
 
 
 # Primäre IP Adressen des Hosts 
@@ -62,9 +58,7 @@ openvpn_server:
 
 administratorenteam:
   - "void"
-  - "dray"
   - "sandhome"
-  - "commander1024"
   
 
 # Definition von Borgbackup Repositories 
diff --git a/host_vars/webserver-test b/host_vars/webserver-test
index 0a951ddfc371a894f14a97258933b340ecf9e5cb..3f03463d392933efc026cb3132757c93c93c20e4 100644
--- a/host_vars/webserver-test
+++ b/host_vars/webserver-test
@@ -6,16 +6,14 @@ motd_lines:
   - "Öffentliche IPs: {{ansible_ens3.ipv4.address}} / {{ansible_ens3.ipv6[0].address}}"
 
 debian_sources: 
-  - "deb http://ftp.halifax.rwth-aachen.de/debian/ stretch main contrib non-free"
-  - "deb http://security.debian.org/ stretch/updates main contrib non-free"
-  - "deb http://ftp.de.debian.org/debian/ stretch-updates main"
-  - "deb http://ftp.halifax.rwth-aachen.de/debian/ stretch-updates main contrib non-free"
-  - "deb https://download.docker.com/linux/debian stretch stable"
-  - "deb https://repos.influxdata.com/debian stretch stable"
-
-debian_keys:
+  - "deb http://ftp.halifax.rwth-aachen.de/debian/ buster main contrib non-free"
+  - "deb http://security.debian.org/ buster/updates main contrib non-free"
+  - "deb https://download.docker.com/linux/debian buster stable"
+
+debian_keys_id:
+
+debian_keys_url:
   - "https://download.docker.com/linux/debian/gpg"
-  - "https://repos.influxdata.com/influxdb.key"
 
 
 # Art des Hosts: physical, vm, docker 
@@ -34,7 +32,5 @@ webserver_domains:
 
 administratorenteam:
   - "void"
-  - "dray"
   - "sandhome"
-  - "commander1024"
   
diff --git a/site.yml b/site.yml
index ad6c954aed1b285c69efcdb159860904a95ba560..2ae1306876cf2e444a16c5f0a0e68348e7e8098a 100644
--- a/site.yml
+++ b/site.yml
@@ -48,7 +48,6 @@
   roles:
     - { role: common/borgbackup, tags: borgbackup }
     - { role: common/docker, tags: docker }
-    - { role: common/telegraf, tags: telegraf }
     - { role: common/nginx, tags: nginx }
     - { role: common/openvpn, tags: openvpn }
     - { role: common/docker_ldap, tags: ldap }
@@ -72,7 +71,6 @@
   remote_user: root
   roles:
     - { role: common/borgbackup, tags: borgbackup }
-    - { role: common/telegraf, tags: telegraf }
     - { role: common/docker, tags: docker }
     - { role: common/nginx, tags: nginx }
     - { role: common/openvpn, tags: openvpn }