diff --git a/docker-compose-mktxp-stack-fs.yml b/docker-compose-mktxp-stack-fs.yml
index 1f20067..1ae18a6 100644
--- a/docker-compose-mktxp-stack-fs.yml
+++ b/docker-compose-mktxp-stack-fs.yml
@@ -47,7 +47,7 @@ services:
   loki:
     command: -config.file=/etc/loki/loki-config.yml
     container_name: loki
-    image: grafana/loki:2.3.0
+    image: grafana/loki:latest
     networks:
       mktxp: null
     ports:
@@ -78,7 +78,7 @@ services:
   promtail:
     command: -config.file=/etc/promtail/promtail-config.yml
     container_name: promtail
-    image: grafana/promtail:2.3.0
+    image: grafana/promtail:latest
     networks:
       mktxp: null
     ports:
diff --git a/docker-compose-mktxp-stack.yml b/docker-compose-mktxp-stack.yml
index 37e9484..8618a16 100644
--- a/docker-compose-mktxp-stack.yml
+++ b/docker-compose-mktxp-stack.yml
@@ -40,7 +40,7 @@ services:
   loki:
     command: -config.file=/etc/loki/loki-config.yml
     container_name: loki
-    image: grafana/loki:2.3.0
+    image: grafana/loki:latest
     networks:
       mktxp: null
     ports:
@@ -71,7 +71,7 @@ services:
   promtail:
     command: -config.file=/etc/promtail/promtail-config.yml
     container_name: promtail
-    image: grafana/promtail:2.3.0
+    image: grafana/promtail:latest
     networks:
       mktxp: null
     ports:
diff --git a/loki/loki-config.yml b/loki/loki-config.yml
index 9fca924..d7cf250 100755
--- a/loki/loki-config.yml
+++ b/loki/loki-config.yml
@@ -4,6 +4,8 @@ server:
   http_listen_port: 3100
 
 ingester:
+  wal:
+    enabled: false  
   lifecycler:
     address: 127.0.0.1
     ring:
diff --git a/mktxp/_mktxp.conf b/mktxp/_mktxp.conf
index 6e14f1c..acb04cc 100644
--- a/mktxp/_mktxp.conf
+++ b/mktxp/_mktxp.conf
@@ -13,7 +13,7 @@
 
 [MKTXP]
     listen = '0.0.0.0:49090'         # Space separated list of socket addresses to listen to, both IPV4 and IPV6
-    socket_timeout = 2
+    socket_timeout = 5
     
     initial_delay_on_failure = 120
     max_delay_on_failure = 900
@@ -27,7 +27,7 @@
 
     fetch_routers_in_parallel = False   # Set to True if you want to fetch multiple routers parallel
     max_worker_threads = 5              # Max number of worker threads that can fetch routers (parallel fetch only)
-    max_scrape_duration = 10            # Max duration of individual routers' metrics collection (parallel fetch only)
-    total_max_scrape_duration = 30      # Max overall duration of all metrics collection (parallel fetch only)
+    max_scrape_duration = 30            # Max duration of individual routers' metrics collection (parallel fetch only)
+    total_max_scrape_duration = 90      # Max overall duration of all metrics collection (parallel fetch only)
 
     compact_default_conf_values = False  # Compact mktxp.conf, so only specific values are kept on the individual routers' level
\ No newline at end of file
diff --git a/mktxp/mktxp.conf b/mktxp/mktxp.conf
index 0ff9462..f27984e 100644
--- a/mktxp/mktxp.conf
+++ b/mktxp/mktxp.conf
@@ -1,5 +1,4 @@
 ## Copyright (c) 2020 Arseniy Kuznetsov
-## Copyright (c) 2020 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License
@@ -54,7 +53,8 @@
     capsman = True                  # CAPsMAN general metrics
     capsman_clients = True          # CAPsMAN clients metrics    
 
-    kid_control_devices = False     # Kid Control metrics    
+    kid_control_assigned = False    # Allow Kid Control metrics for connected devices with assigned users
+    kid_control_dynamic = False     # Allow Kid Control metrics for all connected devices, including those without assigned user
 
     user = True                     # Active Users metrics
     queue = True                    # Queues metrics