diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 1f2047b052..d2440329ed 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -42,6 +42,7 @@ services:
     image: "${DOCKER_REPO}/${TB_NODE_DOCKER_NAME}:${TB_VERSION}"
     ports:
       - "8080"
+      - "7070"
     logging:
       driver: "json-file"
       options:
@@ -50,6 +51,7 @@ services:
     environment:
       TB_SERVICE_ID: tb-core1
       TB_SERVICE_TYPE: tb-core
+      EDGES_ENABLED: "true"
     env_file:
       - tb-node.env
     volumes:
@@ -66,6 +68,7 @@ services:
     image: "${DOCKER_REPO}/${TB_NODE_DOCKER_NAME}:${TB_VERSION}"
     ports:
       - "8080"
+      - "7070"
     logging:
       driver: "json-file"
       options:
@@ -74,6 +77,7 @@ services:
     environment:
       TB_SERVICE_ID: tb-core2
       TB_SERVICE_TYPE: tb-core
+      EDGES_ENABLED: "true"
     env_file:
       - tb-node.env
     volumes:
@@ -239,6 +243,7 @@ services:
      - "80:80"
      - "443:443"
      - "1883:1883"
+     - "7070:7070"
      - "9999:9999"
     cap_add:
      - NET_ADMIN
@@ -246,6 +251,7 @@ services:
       HTTP_PORT: 80
       HTTPS_PORT: 443
       MQTT_PORT: 1883
+      EDGES_RPC_PORT: 7070
       FORCE_HTTPS_REDIRECT: "false"
     links:
         - tb-core1
diff --git a/docker/haproxy/config/haproxy.cfg b/docker/haproxy/config/haproxy.cfg
index 2a457a0696..285de270b3 100644
--- a/docker/haproxy/config/haproxy.cfg
+++ b/docker/haproxy/config/haproxy.cfg
@@ -49,6 +49,17 @@ listen mqtt-in
  server tbMqtt1 tb-mqtt-transport1:1883 check inter 5s resolvers docker_resolver resolve-prefer ipv4
  server tbMqtt2 tb-mqtt-transport2:1883 check inter 5s resolvers docker_resolver resolve-prefer ipv4
 
+listen edges-rpc-in
+ bind *:${EDGES_RPC_PORT}
+ mode tcp
+ option clitcpka # For TCP keep-alive
+ timeout client 3h
+ timeout server 3h
+ option tcplog
+ balance leastconn
+ server tbEdgesRpc1 tb-core1:7070 check inter 5s resolvers docker_resolver resolve-prefer ipv4
+ server tbEdgesRpc2 tb-core2:7070 check inter 5s resolvers docker_resolver resolve-prefer ipv4
+
 frontend http-in
  bind *:${HTTP_PORT}