diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml
index 86835ae..2a87bea 100644
--- a/monitoring/docker-compose.yaml
+++ b/monitoring/docker-compose.yaml
@@ -70,6 +70,46 @@ services:
       - "traefik.docker.network=web"
       - "docker.group=monitoring"
 
+
+  ##################################################################
+  # here starts data collection
+
+  telegraf_host:
+    image: telegraf:1.18
+    restart: unless-stopped
+    environment:
+      - HOST_MOUNT_PREFIX=/hostfs
+      - HOST_PROC=/hostfs/proc
+      - HOST_SYS=/hostfs/sys
+      - HOST_ETC=/hostfs/etc
+      - HOST_VAR=/hostfs/var
+      - HOST_RUN=/hostfs/run
+    volumes:
+     - ./telegraf/telegraf_host.conf:/etc/telegraf/telegraf.conf:ro
+     - /var/run/utmp:/var/run/utmp:ro
+     - /:/hostfs:ro
+    network_mode: "host"
+    labels:
+      - "docker.group=monitoring"
+    depends_on:
+      - influxdb
+
+
+  telegraf_net:
+    image: telegraf:1.18
+    restart: unless-stopped
+    volumes:
+     - ./telegraf/telegraf_net.conf:/etc/telegraf/telegraf.conf:ro
+    networks:
+      - monitoring
+      - dockersocket
+    labels:
+      - "docker.group=monitoring"
+    depends_on:
+      - influxdb
+    dns: 
+      - 192.168.16.5
+
 networks:
   monitoring:
   web:
diff --git a/telegraf/telegraf_host.conf b/monitoring/telegraf/telegraf_host.conf
similarity index 100%
rename from telegraf/telegraf_host.conf
rename to monitoring/telegraf/telegraf_host.conf
diff --git a/telegraf/telegraf_net.conf b/monitoring/telegraf/telegraf_net.conf
similarity index 100%
rename from telegraf/telegraf_net.conf
rename to monitoring/telegraf/telegraf_net.conf
diff --git a/telegraf/test-telegraf.sh b/monitoring/test-telegraf.sh
similarity index 100%
rename from telegraf/test-telegraf.sh
rename to monitoring/test-telegraf.sh
diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml
index f8ff06d..04a0016 100644
--- a/proxy/docker-compose.yaml
+++ b/proxy/docker-compose.yaml
@@ -44,7 +44,7 @@ services:
       - web
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.whoami.rule=Host(`whoami.${HOSTNAME}`)"
+      - "traefik.http.routers.whoami.rule=Host(`whoami.${DOMAIN}`)"
       - "traefik.http.routers.whoami.entrypoints=web"
       - "traefik.http.services.whoami.loadbalancer.server.port=80"
       - "docker.group=proxy"
diff --git a/telegraf/docker-compose.yaml b/telegraf/docker-compose.yaml
deleted file mode 100644
index 91950d4..0000000
--- a/telegraf/docker-compose.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-version: "3.3"
-services:
-
-  host:
-    image: telegraf:1.18
-    restart: unless-stopped
-    environment:
-      - HOST_MOUNT_PREFIX=/hostfs
-      - HOST_PROC=/hostfs/proc
-      - HOST_SYS=/hostfs/sys
-      - HOST_ETC=/hostfs/etc
-      - HOST_VAR=/hostfs/var
-      - HOST_RUN=/hostfs/run
-    volumes:
-     - ./telegraf_host.conf:/etc/telegraf/telegraf.conf:ro
-     - /var/run/utmp:/var/run/utmp:ro
-     - /:/hostfs:ro
-    network_mode: "host"
-    labels:
-      - "docker.group=telegraf"
-
-  net:
-    image: telegraf:1.18
-    restart: unless-stopped
-    volumes:
-     - ./telegraf_net.conf:/etc/telegraf/telegraf.conf:ro
-    networks:
-      - dockersocket
-    labels:
-      - "docker.group=telegraf"
-    dns: 
-      - ${LOCAL_DNS_SERVER}
-
-networks:
-  dockersocket:
-    external: true
diff --git a/telegraf/influxdb.conf b/telegraf/influxdb.conf
deleted file mode 100644
index 9244c34..0000000
--- a/telegraf/influxdb.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[meta]
-  dir = "/var/lib/influxdb/meta"
-
-[data]
-  dir = "/var/lib/influxdb/data"
-  wal-dir = "/var/lib/influxdb/wal"
-  max-concurrent-compactions = 1
-
-[monitor]
-  store-enabled = false
-  store-database = "_internal"
-  store-interval = "10s"