diff --git a/application/src/main/conf/logback.xml b/application/src/main/conf/logback.xml
index 6d2c95ee84..284af71953 100644
--- a/application/src/main/conf/logback.xml
+++ b/application/src/main/conf/logback.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/application/src/main/resources/logback.xml b/application/src/main/resources/logback.xml
index 4784ad2d43..941bd7d278 100644
--- a/application/src/main/resources/logback.xml
+++ b/application/src/main/resources/logback.xml
@@ -27,7 +27,7 @@
-
+
diff --git a/docker/tb-node/conf/logback.xml b/docker/tb-node/conf/logback.xml
index bc694d704d..c17e8a43cf 100644
--- a/docker/tb-node/conf/logback.xml
+++ b/docker/tb-node/conf/logback.xml
@@ -42,6 +42,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docker/tb-transports/coap/conf/logback.xml b/docker/tb-transports/coap/conf/logback.xml
index 1a3e8ef6b3..65d13a55cf 100644
--- a/docker/tb-transports/coap/conf/logback.xml
+++ b/docker/tb-transports/coap/conf/logback.xml
@@ -42,6 +42,11 @@
+
+
+
+
+
diff --git a/docker/tb-transports/http/conf/logback.xml b/docker/tb-transports/http/conf/logback.xml
index 05361fe680..a3ae374bb7 100644
--- a/docker/tb-transports/http/conf/logback.xml
+++ b/docker/tb-transports/http/conf/logback.xml
@@ -42,6 +42,11 @@
+
+
+
+
+
diff --git a/docker/tb-transports/lwm2m/conf/logback.xml b/docker/tb-transports/lwm2m/conf/logback.xml
index d2485675ee..5546167f3d 100644
--- a/docker/tb-transports/lwm2m/conf/logback.xml
+++ b/docker/tb-transports/lwm2m/conf/logback.xml
@@ -42,6 +42,10 @@
+
+
+
+
diff --git a/docker/tb-transports/mqtt/conf/logback.xml b/docker/tb-transports/mqtt/conf/logback.xml
index 09bcaea84c..d4e7b811f8 100644
--- a/docker/tb-transports/mqtt/conf/logback.xml
+++ b/docker/tb-transports/mqtt/conf/logback.xml
@@ -42,6 +42,10 @@
+
+
+
+
diff --git a/docker/tb-transports/snmp/conf/logback.xml b/docker/tb-transports/snmp/conf/logback.xml
index dc53ddd8a3..0b6fbc726b 100644
--- a/docker/tb-transports/snmp/conf/logback.xml
+++ b/docker/tb-transports/snmp/conf/logback.xml
@@ -42,6 +42,10 @@
+
+
+
+
diff --git a/docker/tb-vc-executor/conf/logback.xml b/docker/tb-vc-executor/conf/logback.xml
index dc95b3a885..ebde7cbd69 100644
--- a/docker/tb-vc-executor/conf/logback.xml
+++ b/docker/tb-vc-executor/conf/logback.xml
@@ -40,8 +40,11 @@
-
-
+
+
+
+
+
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
index 60934bdbbf..ffd2e1f50a 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
@@ -95,7 +95,7 @@ public class ContainerTestSuite {
new File(targetDir + "docker-compose.postgres.volumes.yml"),
new File(targetDir + "docker-compose." + QUEUE_TYPE + ".yml"),
new File(targetDir + (IS_REDIS_CLUSTER ? "docker-compose.redis-cluster.yml" : "docker-compose.redis.yml")),
- new File(targetDir + (IS_HYBRID_MODE ? "docker-compose.redis-cluster.volumes.yml" : "docker-compose.redis.volumes.yml"))
+ new File(targetDir + (IS_REDIS_CLUSTER ? "docker-compose.redis-cluster.volumes.yml" : "docker-compose.redis.volumes.yml"))
));
Map queueEnv = new HashMap<>();
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ThingsBoardDbInstaller.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ThingsBoardDbInstaller.java
index c39932b572..eedf070fac 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ThingsBoardDbInstaller.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ThingsBoardDbInstaller.java
@@ -46,7 +46,7 @@ public class ThingsBoardDbInstaller extends ExternalResource {
private final static String TB_MQTT_TRANSPORT_LOG_VOLUME = "tb-mqtt-transport-log-test-volume";
private final static String TB_SNMP_TRANSPORT_LOG_VOLUME = "tb-snmp-transport-log-test-volume";
private final static String TB_VC_EXECUTOR_LOG_VOLUME = "tb-vc-executor-log-test-volume";
- private final static String JAVA_OPTS = "-Xmx384m -Xss256k";
+ private final static String JAVA_OPTS = "-Xmx512m";
private final DockerComposeExecutor dockerCompose;
diff --git a/msa/tb/docker/logback.xml b/msa/tb/docker/logback.xml
index 92fab7bc88..01fc5d30a8 100644
--- a/msa/tb/docker/logback.xml
+++ b/msa/tb/docker/logback.xml
@@ -42,6 +42,8 @@
+
+
diff --git a/msa/vc-executor/src/main/conf/logback.xml b/msa/vc-executor/src/main/conf/logback.xml
index c0f33852a6..d7468ef257 100644
--- a/msa/vc-executor/src/main/conf/logback.xml
+++ b/msa/vc-executor/src/main/conf/logback.xml
@@ -35,8 +35,10 @@
+
+
-
+
diff --git a/msa/vc-executor/src/main/resources/logback.xml b/msa/vc-executor/src/main/resources/logback.xml
index e25a1995c1..e0a240aee3 100644
--- a/msa/vc-executor/src/main/resources/logback.xml
+++ b/msa/vc-executor/src/main/resources/logback.xml
@@ -25,11 +25,11 @@
-
-
+
+
-
+
diff --git a/transport/coap/src/main/conf/logback.xml b/transport/coap/src/main/conf/logback.xml
index a769cbe364..d7468ef257 100644
--- a/transport/coap/src/main/conf/logback.xml
+++ b/transport/coap/src/main/conf/logback.xml
@@ -38,7 +38,7 @@
-
+
diff --git a/transport/coap/src/main/resources/logback.xml b/transport/coap/src/main/resources/logback.xml
index 44ddb3d372..e0a240aee3 100644
--- a/transport/coap/src/main/resources/logback.xml
+++ b/transport/coap/src/main/resources/logback.xml
@@ -28,9 +28,8 @@
-
-
+
diff --git a/transport/http/src/main/conf/logback.xml b/transport/http/src/main/conf/logback.xml
index a769cbe364..d7468ef257 100644
--- a/transport/http/src/main/conf/logback.xml
+++ b/transport/http/src/main/conf/logback.xml
@@ -38,7 +38,7 @@
-
+
diff --git a/transport/http/src/main/resources/logback.xml b/transport/http/src/main/resources/logback.xml
index 44ddb3d372..80f9525f2e 100644
--- a/transport/http/src/main/resources/logback.xml
+++ b/transport/http/src/main/resources/logback.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/transport/lwm2m/src/main/conf/logback.xml b/transport/lwm2m/src/main/conf/logback.xml
index a769cbe364..d7468ef257 100644
--- a/transport/lwm2m/src/main/conf/logback.xml
+++ b/transport/lwm2m/src/main/conf/logback.xml
@@ -38,7 +38,7 @@
-
+
diff --git a/transport/lwm2m/src/main/resources/logback.xml b/transport/lwm2m/src/main/resources/logback.xml
index 44ddb3d372..80f9525f2e 100644
--- a/transport/lwm2m/src/main/resources/logback.xml
+++ b/transport/lwm2m/src/main/resources/logback.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/transport/mqtt/src/main/conf/logback.xml b/transport/mqtt/src/main/conf/logback.xml
index a769cbe364..d7468ef257 100644
--- a/transport/mqtt/src/main/conf/logback.xml
+++ b/transport/mqtt/src/main/conf/logback.xml
@@ -38,7 +38,7 @@
-
+
diff --git a/transport/mqtt/src/main/resources/logback.xml b/transport/mqtt/src/main/resources/logback.xml
index 44ddb3d372..80f9525f2e 100644
--- a/transport/mqtt/src/main/resources/logback.xml
+++ b/transport/mqtt/src/main/resources/logback.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/transport/snmp/src/main/conf/logback.xml b/transport/snmp/src/main/conf/logback.xml
index a769cbe364..d7468ef257 100644
--- a/transport/snmp/src/main/conf/logback.xml
+++ b/transport/snmp/src/main/conf/logback.xml
@@ -38,7 +38,7 @@
-
+
diff --git a/transport/snmp/src/main/resources/logback.xml b/transport/snmp/src/main/resources/logback.xml
index 44ddb3d372..80f9525f2e 100644
--- a/transport/snmp/src/main/resources/logback.xml
+++ b/transport/snmp/src/main/resources/logback.xml
@@ -30,7 +30,7 @@
-
+