diff --git a/bitwarden/.gitkeep b/bitwarden/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/caddy_data/.gitkeep b/caddy_data/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/docker-compose.yml b/docker-compose.yml
index 62ff9f5..3a52db3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,10 @@
 version: '2'
 
-service:
+networks:
+  caddy:
+    internal: true
+
+services:
   caddy:
     image: lucaslorentz/caddy-docker-proxy
     ports:
@@ -8,58 +12,97 @@ service:
       - 443:443
     networks:
       - caddy
+      - default
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       # this volume is needed to keep the certificates
       # otherwise, new ones will be re-issued upon restart
-      - caddy_data:/data
+      - ./caddy_data:/data
     labels: # Global options
       caddy.email: arne.schroeder@mailbox.org
 
-  # Proxy to service
-  whoami0:
-    image: jwilder/whoami
+  mqtt:
+    image: eclipse-mosquitto:latest
+    container_name: mqtt
+    ports:
+      - 1883:1883
+      - 9001:9001
+    volumes:
+      - ./mqtt/mosquitto.conf:/mosquitto/config/mosquitto.conf
+      - ./mqtt/data:/mosquitto/data
+      - ./mqtt/log:/mosquotto/log
+    restart: always
+    networks:
+      - default
+
+  influxdb:
+    image: influxdb:latest
+    container_name: influxdb
+    ports:
+      - 8086:8086
+    environment:
+      - INFLUXDB_DB=data
+      - INFLUXDB_ADMIN_USER=admin
+      - INFLUXDB_ADMIN_PASSWORD=Schroeder87
+      - INFLUXDB_USER=arne
+      - INFLUXDB_USER_PASSWORD=Schroeder87
+    volumes:
+      - ./influxdb:/var/lib/influxdb
+    restart: always
+    networks:
+      - default
+      - caddy
+
+  grafana:
+    image: grafana/grafana:7.2.0
+    container_name: grafana
+    environment:
+      - GF_SECURITY_ADMIN_PASSWORD=Schroeder87
+    depends_on:
+      - influxdb
+    volumes:
+      - ./grafana:/var/lib/grafana
+    labels:
+      caddy: grafana.devsrv.fritz.box
+      caddy.reverse_proxy: "{{upstreams 3000}}"
+      caddy.tls: "internal"
+    restart: always
     networks:
       - caddy
-    labels:
-      caddy: whoami0.devsrv.fritz.box
-      caddy.reverse_proxy: "{{upstreams 8000}}"
-      caddy.tls: "internal"
 
-  # Proxy to service that you want to expose to the outside world
-  whoami1:
-    image: jwilder/whoami
+  heimdall:
+    image: linuxserver/heimdall
+    container_name: heimdall
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Berlin
+    volumes:
+      - ./heimdall:/config
+    labels:
+      caddy: devsrv.fritz.box
+      caddy.reverse_proxy: "{{upstreams 80}}"
+      caddy.tls: "internal"
+    restart: always
     networks:
       - caddy
-    labels:
-      caddy: whoami1.devsrv.fritz.box
-      caddy.reverse_proxy: "{{upstreams 8000}}"
-      caddy.tls: "internal"
-      # remove the following line when you have verified your setup
-      # Otherwise you risk being rate limited by let's encrypt
-      #caddy.tls.ca: https://acme-staging-v02.api.letsencrypt.org/directory
 
-  # Proxy to container
-  whoami2:
-    image: jwilder/whoami
+  bitwarden:
+    image: bitwardenrs/server:1.16.3-alpine
+    container_name: bitwarden
+    environment:
+      WEBSOCKET_ENABLED: 'true'
+      SIGNUPS_ALLOWED: 'true'
+    volumes:
+      - ./bitwarden:/data
+    labels:
+      caddy: pw.fritz.box
+      caddy.reverse_proxy: "{{upstreams 80}}"
+      caddy.tls: "internal"
+    restart: always
     networks:
       - caddy
-    labels:
-      caddy: whoami2.devsrv.fritz.box
-      caddy.reverse_proxy: "{{upstreams 8000}}"
-      caddy.tls: "internal"
 
-  # Proxy to container
-  whoami3:
-    image: jwilder/whoami
-    networks:
-      - caddy
-    labels:
-      caddy: whoami3.devsrv.fritz.box
-      caddy.reverse_proxy: "{{upstreams 8000}}"
-      caddy.tls: "internal"
-
-  # Proxy with matches and route
   echo_0:
     image: brndnmtthws/nginx-echo-headers
     networks:
diff --git a/grafana/.gitkeep b/grafana/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/heimdall/.gitkeep b/heimdall/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/influxdb/.gitkeep b/influxdb/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/mqtt/data/.gitkeep b/mqtt/data/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/mqtt/log/.gitkeep b/mqtt/log/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/mqtt/mosquitto.conf b/mqtt/mosquitto.conf
new file mode 100644
index 0000000..e69de29