diff --git a/docker/docker-compose.edqs.yml b/docker/docker-compose.edqs.yml
index 2f0e836240..67e9c987e3 100644
--- a/docker/docker-compose.edqs.yml
+++ b/docker/docker-compose.edqs.yml
@@ -19,10 +19,16 @@ version: '3.0'
 services:
   tb-core1:
     env_file:
-      - tb-node-edqs.env
+      - tb-core-edqs.env
   tb-core2:
     env_file:
-      - tb-node-edqs.env
+      - tb-core-edqs.env
+  tb-rule-engine1:
+    env_file:
+      - tb-rule-engine-edqs.env
+  tb-rule-engine2:
+    env_file:
+      - tb-rule-engine-edqs.env
   tb-edqs-1:
     restart: always
     image: "${DOCKER_REPO}/${EDQS_DOCKER_NAME}:${TB_VERSION}"
diff --git a/docker/tb-node-edqs.env b/docker/tb-core-edqs.env
similarity index 85%
rename from docker/tb-node-edqs.env
rename to docker/tb-core-edqs.env
index 1ef523af50..1417b780ec 100644
--- a/docker/tb-node-edqs.env
+++ b/docker/tb-core-edqs.env
@@ -1,4 +1,5 @@
 # ThingsBoard server configuration with enabled EDQS synchronization
 
+TB_EDQS_MODE=remote
 TB_EDQS_SYNC_ENABLED=true
 TB_EDQS_API_ENABLED=true
\ No newline at end of file
diff --git a/docker/tb-node.env b/docker/tb-node.env
index e07d5a2f23..85a60eb51a 100644
--- a/docker/tb-node.env
+++ b/docker/tb-node.env
@@ -4,7 +4,6 @@ ZOOKEEPER_ENABLED=true
 ZOOKEEPER_URL=zookeeper:2181
 JS_EVALUATOR=remote
 TRANSPORT_TYPE=remote
-TB_EDQS_MODE=remote
 
 HTTP_LOG_CONTROLLER_ERROR_STACK_TRACE=false
 
diff --git a/docker/tb-rule-engine-edqs.env b/docker/tb-rule-engine-edqs.env
new file mode 100644
index 0000000000..82395ddcfe
--- /dev/null
+++ b/docker/tb-rule-engine-edqs.env
@@ -0,0 +1,3 @@
+# ThingsBoard server configuration with enabled EDQS synchronization
+
+TB_EDQS_SYNC_ENABLED=true