diff --git a/common/nginx/includes/unifi.warpone b/common/nginx/includes/unifi.warpone
new file mode 100644
index 0000000000000000000000000000000000000000..d266449e3051680836e5eae07a4ad21769796b81
--- /dev/null
+++ b/common/nginx/includes/unifi.warpone
@@ -0,0 +1,4 @@
+
+    location / {
+      rewrite     ^(.*)   https://warpsrvint:8443$1;
+    }
diff --git a/common/nginx/tasks/main.yml b/common/nginx/tasks/main.yml
index dc2c8d18efe2114f19d69c65e4bae880e4cea581..4afb9d88b622d26eba7dffe0ae4ed60241f6cd1c 100644
--- a/common/nginx/tasks/main.yml
+++ b/common/nginx/tasks/main.yml
@@ -41,43 +41,9 @@
     state: absent
 
 
-# LetsEncrypt Script erstellen 
-- name: LetsEncrypt Script erstellen 
-  template: src=letsencrypt.sh dest=/opt/letsencrypt.sh mode=o+x
-  notify: restart nginx
-  when: webserver_ssl == true
-
-
-- name: Cronjob für Zertifikatserneuerung
-  cron: name="letsencrypt" weekday="*" hour="6" minute="0" job="/opt/letsencrypt.sh"
-  when: webserver_ssl == true
-
-
 # nginx konfigurieren 
 - include: config_site.yml
   with_items:
     - "{{ webserver_domains }}"
  
 
-# matrix config 
-- name: Konfig-Datei matrix erstellen
-  template: src=nginx-matrix dest=/etc/nginx/sites-enabled/matrix
-  notify: restart nginx
-  when: inventory_hostname == 'webserver'
-
-- name: Konfig-Datei status erstellen
-  template: src=nginx-status dest=/etc/nginx/sites-enabled/status
-  notify: restart nginx
-
-
-# telegraf konfigurieren 
-- name: Konfig-Datei status erstellen
-  template: src=telegraf.conf dest=/etc/telegraf/telegraf.d/nginx.conf
-  notify: restart telegraf 
-  
-- name: adding existing user 'telegraf' to group adm
-  user:
-    name: telegraf
-    groups: adm
-    append: yes
-
diff --git a/host_vars/warpsrvint b/host_vars/warpsrvint
index fe244c2ad4b1ff0ecf02da0b0d52845753d64b32..49e53ec2aa9aacf09b1dd82185c7de0c4505df08 100644
--- a/host_vars/warpsrvint
+++ b/host_vars/warpsrvint
@@ -35,6 +35,7 @@ webserver_domains:
   - "infra.warpzone"
   - "esphome.warpzone"
   - "ldap.warpzone"
+  - "unifi.warpzone"
 
 administratorenteam:
   - "void"
diff --git a/site.yml b/site.yml
index 8cb7a6f550da4245a315425d118b1ada6a92d45c..a98d803578a42828bf233b4dcbc2680abcbe4b85 100644
--- a/site.yml
+++ b/site.yml
@@ -202,27 +202,20 @@
 # Test / Development Server
 ##################################################
 
-- hosts: develop
-  remote_user: root
-  roles:
-    - { role: common/docker, tags: docker }
-    - { role: common/telegraf, tags: telegraf }
-    - { role: common/nginx, tags: nginx }
+# - hosts: develop
+#   remote_user: root
+#   roles:
+#     - { role: common/docker, tags: docker }
+#     - { role: common/nginx, tags: nginx }
 
 
-- hosts: webserver-test
-  remote_user: root
-  roles:
-    - { role: common/docker, tags: docker }
-    - { role: common/nginx, tags: nginx }
-#    - { role: ../webserver/docker_ldap, tags: ldap }
-    - { role: webserver/docker_wordpress, tags: wordpress }
+# - hosts: webserver-test
+#   remote_user: root
+#   roles:
+#     - { role: common/docker, tags: docker }
+#     - { role: common/nginx, tags: nginx }
+# #    - { role: ../webserver/docker_ldap, tags: ldap }
+#     - { role: webserver/docker_wordpress, tags: wordpress }
+
 
-#    - { role: docker_mail, tags: mail }
-#    - { role: ../webserver/docker_jabber, tags: jabber }
 
-- hosts: warphab
-  remote_user: root
-  roles:
-    - { role: warphab/homegear, tags: homegear }
-    - { role: warphab/openhab, tags: openhab }
diff --git a/warpsrvint/docker_esphome/templates/config/common.inc.yaml b/warpsrvint/docker_esphome/templates/config/common.inc.yaml
index e18316a2a311fa93b102910280a8c092430ee7c3..42b517c7b5d721956a662633c87ed5b6634b043f 100644
--- a/warpsrvint/docker_esphome/templates/config/common.inc.yaml
+++ b/warpsrvint/docker_esphome/templates/config/common.inc.yaml
@@ -1,7 +1,7 @@
 
 # WiFi settings 
 wifi:
-  ssid: "warpzone"
+  ssid: "Internet-of-Shit"
   password: "{{ wlan_pass }}"
 
   # Enable fallback hotspot (captive portal) in case wifi connection fails
diff --git a/warpsrvint/docker_esphome/templates/config/hauptraum.yaml b/warpsrvint/docker_esphome/templates/config/hauptraum.yaml
index ec1a42196bdfd2f7f133f34e0231135a15b93a71..eb62f7bba2604a5359d57eea572ad880ff6f5a75 100644
--- a/warpsrvint/docker_esphome/templates/config/hauptraum.yaml
+++ b/warpsrvint/docker_esphome/templates/config/hauptraum.yaml
@@ -8,14 +8,14 @@
   
 # Sensor configs 
 i2c:
-  sda: D3
-  scl: D4
+  sda: D0
+  scl: D5
   scan: True
 
 sensor:
   - platform: bme280
     temperature:
-      name: "Temp"
+      name: "Temp_bme280"
       oversampling: 16x
       filters:
       - offset: 0.635
@@ -24,7 +24,7 @@ sensor:
           send_every: 3
           send_first_at: 3
     pressure:
-      name: "Pressure"
+      name: "Pressure_bme280"
       oversampling: 16x
       accuracy_decimals: 2
       filters:
@@ -33,7 +33,7 @@ sensor:
           send_every: 3
           send_first_at: 3
     humidity:
-      name: "Humidity"
+      name: "Humidity_bme280"
       oversampling: 16x
       accuracy_decimals: 2
       filters:
@@ -44,4 +44,23 @@ sensor:
     address: 0x76
     update_interval: 10s
     iir_filter: 16x
-  
\ No newline at end of file
+
+  - platform: bmp280
+    temperature:
+      name: "Temp_bmp280"
+      oversampling: 16x
+      filters:
+      - offset: 0.635
+      - sliding_window_moving_average:
+          window_size: 3
+          send_every: 3
+          send_first_at: 3
+    pressure:
+      name: "Pressure_bmp280"
+      oversampling: 16x
+      accuracy_decimals: 2
+      filters:
+      - sliding_window_moving_average:
+          window_size: 3
+          send_every: 3
+          send_first_at: 3
diff --git a/warpsrvint/docker_esphome/templates/config/holzwerkstatt.yaml b/warpsrvint/docker_esphome/templates/config/holzwerkstatt.yaml
index c4ba9868775e6018e3ec18cdc7e2b50e0f18869c..114280d5b2eaa5489a3583a71f3361da8e2c76eb 100644
--- a/warpsrvint/docker_esphome/templates/config/holzwerkstatt.yaml
+++ b/warpsrvint/docker_esphome/templates/config/holzwerkstatt.yaml
@@ -8,14 +8,14 @@
   
 # Sensor configs 
 i2c:
-  sda: D3
-  scl: D4
+  sda: D0
+  scl: D5
   scan: True
 
 sensor:
   - platform: bme280
     temperature:
-      name: "Temp"
+      name: "Temp_bme280"
       oversampling: 16x
       filters:
       - offset: 0.635
@@ -24,7 +24,7 @@ sensor:
           send_every: 3
           send_first_at: 3
     pressure:
-      name: "Pressure"
+      name: "Pressure_bme280"
       oversampling: 16x
       accuracy_decimals: 2
       filters:
@@ -33,7 +33,7 @@ sensor:
           send_every: 3
           send_first_at: 3
     humidity:
-      name: "Humidity"
+      name: "Humidity_bme280"
       oversampling: 16x
       accuracy_decimals: 2
       filters:
@@ -44,4 +44,23 @@ sensor:
     address: 0x76
     update_interval: 10s
     iir_filter: 16x
-  
\ No newline at end of file
+
+  - platform: bmp280
+    temperature:
+      name: "Temp_bmp280"
+      oversampling: 16x
+      filters:
+      - offset: 0.635
+      - sliding_window_moving_average:
+          window_size: 3
+          send_every: 3
+          send_first_at: 3
+    pressure:
+      name: "Pressure_bmp280"
+      oversampling: 16x
+      accuracy_decimals: 2
+      filters:
+      - sliding_window_moving_average:
+          window_size: 3
+          send_every: 3
+          send_first_at: 3
diff --git a/warpsrvint/docker_esphome/templates/config/lounge.yaml b/warpsrvint/docker_esphome/templates/config/lounge.yaml
index 604688ca9d9f9d0eac7e2bb3454659162efcfe0b..ecfebe089df9cc5de08b67cbbacdd554194995b1 100644
--- a/warpsrvint/docker_esphome/templates/config/lounge.yaml
+++ b/warpsrvint/docker_esphome/templates/config/lounge.yaml
@@ -8,14 +8,14 @@
   
 # Sensor configs 
 i2c:
-  sda: D3
-  scl: D4
+  sda: D0
+  scl: D5
   scan: True
 
 sensor:
   - platform: bme280
     temperature:
-      name: "Temp"
+      name: "Temp_bme280"
       oversampling: 16x
       filters:
       - offset: 0.635
@@ -24,7 +24,7 @@ sensor:
           send_every: 3
           send_first_at: 3
     pressure:
-      name: "Pressure"
+      name: "Pressure_bme280"
       oversampling: 16x
       accuracy_decimals: 2
       filters:
@@ -33,7 +33,7 @@ sensor:
           send_every: 3
           send_first_at: 3
     humidity:
-      name: "Humidity"
+      name: "Humidity_bme280"
       oversampling: 16x
       accuracy_decimals: 2
       filters:
@@ -44,4 +44,23 @@ sensor:
     address: 0x76
     update_interval: 10s
     iir_filter: 16x
-  
\ No newline at end of file
+
+  - platform: bmp280
+    temperature:
+      name: "Temp_bmp280"
+      oversampling: 16x
+      filters:
+      - offset: 0.635
+      - sliding_window_moving_average:
+          window_size: 3
+          send_every: 3
+          send_first_at: 3
+    pressure:
+      name: "Pressure_bmp280"
+      oversampling: 16x
+      accuracy_decimals: 2
+      filters:
+      - sliding_window_moving_average:
+          window_size: 3
+          send_every: 3
+          send_first_at: 3
diff --git a/warpsrvint/docker_esphome/templates/config/vortragsraum.yaml b/warpsrvint/docker_esphome/templates/config/vortragsraum.yaml
index e19bf4bd718b45e0a9fc93e11894493e0fd832c9..429a58d869456a9ffa0d92a34e24c32eadff8e82 100644
--- a/warpsrvint/docker_esphome/templates/config/vortragsraum.yaml
+++ b/warpsrvint/docker_esphome/templates/config/vortragsraum.yaml
@@ -8,14 +8,14 @@
   
 # Sensor configs 
 i2c:
-  sda: D3
-  scl: D4
+  sda: D0
+  scl: D5
   scan: True
 
 sensor:
   - platform: bme280
     temperature:
-      name: "Temp"
+      name: "Temp_bme280"
       oversampling: 16x
       filters:
       - offset: 0.635
@@ -24,7 +24,7 @@ sensor:
           send_every: 3
           send_first_at: 3
     pressure:
-      name: "Pressure"
+      name: "Pressure_bme280"
       oversampling: 16x
       accuracy_decimals: 2
       filters:
@@ -33,7 +33,7 @@ sensor:
           send_every: 3
           send_first_at: 3
     humidity:
-      name: "Humidity"
+      name: "Humidity_bme280"
       oversampling: 16x
       accuracy_decimals: 2
       filters:
@@ -44,4 +44,23 @@ sensor:
     address: 0x76
     update_interval: 10s
     iir_filter: 16x
-  
\ No newline at end of file
+
+  - platform: bmp280
+    temperature:
+      name: "Temp_bmp280"
+      oversampling: 16x
+      filters:
+      - offset: 0.635
+      - sliding_window_moving_average:
+          window_size: 3
+          send_every: 3
+          send_first_at: 3
+    pressure:
+      name: "Pressure_bmp280"
+      oversampling: 16x
+      accuracy_decimals: 2
+      filters:
+      - sliding_window_moving_average:
+          window_size: 3
+          send_every: 3
+          send_first_at: 3
diff --git a/warpsrvint/docker_esphome/templates/docker-compose.yml b/warpsrvint/docker_esphome/templates/docker-compose.yml
index b9f71249e74dc26e01b59d6b7a45cc5e789650b2..d43da733389a07a2bbb14fa1e19602c713b97bfc 100644
--- a/warpsrvint/docker_esphome/templates/docker-compose.yml
+++ b/warpsrvint/docker_esphome/templates/docker-compose.yml
@@ -6,6 +6,7 @@ services:
 
     image: esphome/esphome:1.19.0
     restart: always
-    network_mode: "host"
+    # listen on Port 6052
+    network_mode: host
     volumes:
       - "{{ basedir }}/config/:/config"