diff --git a/docker/.env b/docker/.env
index ef0bf40316..bd4b4730a6 100644
--- a/docker/.env
+++ b/docker/.env
@@ -1,3 +1,4 @@
+TB_QUEUE_TYPE=kafka
 
 DOCKER_REPO=thingsboard
 
diff --git a/docker/compose-utils.sh b/docker/compose-utils.sh
index a5aafc5c9e..ac8d4fce78 100755
--- a/docker/compose-utils.sh
+++ b/docker/compose-utils.sh
@@ -32,6 +32,32 @@ function additionalComposeArgs() {
     echo $ADDITIONAL_COMPOSE_ARGS
 }
 
+function additionalComposeQueueArgs() {
+    source .env
+    ADDITIONAL_COMPOSE_QUEUE_ARGS=""
+    case $TB_QUEUE_TYPE in
+        kafka)
+        ADDITIONAL_COMPOSE_QUEUE_ARGS="-f docker-compose.kafka.yml"
+        ;;
+        aws-sqs)
+        ADDITIONAL_COMPOSE_QUEUE_ARGS="-f docker-compose.aws-sqs.yml"
+        ;;
+        pubsub)
+        ADDITIONAL_COMPOSE_QUEUE_ARGS="-f docker-compose.pubsub.yml"
+        ;;
+        rabbitmq)
+        ADDITIONAL_COMPOSE_QUEUE_ARGS="-f docker-compose.rabbitmq.yml"
+        ;;
+        service-bus)
+        ADDITIONAL_COMPOSE_QUEUE_ARGS="-f docker-compose.service-bus.yml"
+        ;;
+        *)
+        echo "Unknown Queue service value specified: '${TB_QUEUE_TYPE}'. Should be either kafka or aws-sqs or pubsub or rabbitmq or service-bus." >&2
+        exit 1
+    esac
+    echo $ADDITIONAL_COMPOSE_QUEUE_ARGS
+}
+
 function additionalStartupServices() {
     source .env
     ADDITIONAL_STARTUP_SERVICES=""
diff --git a/docker/docker-compose.aws-sqs.yml b/docker/docker-compose.aws-sqs.yml
new file mode 100644
index 0000000000..e58917043b
--- /dev/null
+++ b/docker/docker-compose.aws-sqs.yml
@@ -0,0 +1,71 @@
+#
+# Copyright © 2016-2020 The Thingsboard Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+version: '2.2'
+
+services:
+  tb-js-executor:
+    env_file:
+      - queue-aws-sqs.env
+  tb-core1:
+    env_file:
+      - queue-aws-sqs.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-core2:
+    env_file:
+      - queue-aws-sqs.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-rule-engine1:
+    env_file:
+      - queue-aws-sqs.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-rule-engine2:
+    env_file:
+      - queue-aws-sqs.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-mqtt-transport1:
+    env_file:
+      - queue-aws-sqs.env
+    depends_on:
+      - zookeeper
+  tb-mqtt-transport2:
+    env_file:
+      - queue-aws-sqs.env
+    depends_on:
+      - zookeeper
+  tb-http-transport1:
+    env_file:
+      - queue-aws-sqs.env
+    depends_on:
+      - zookeeper
+  tb-http-transport2:
+    env_file:
+      - queue-aws-sqs.env
+    depends_on:
+      - zookeeper
+  tb-coap-transport:
+    env_file:
+      - queue-aws-sqs.env
+    depends_on:
+      - zookeeper
\ No newline at end of file
diff --git a/docker/docker-compose.cassandra.yml b/docker/docker-compose.cassandra.yml
index 1066570140..d45fd6e9df 100644
--- a/docker/docker-compose.cassandra.yml
+++ b/docker/docker-compose.cassandra.yml
@@ -28,27 +28,27 @@ services:
     env_file:
       - tb-node.cassandra.env
     depends_on:
-      - kafka
+      - zookeeper
       - redis
       - cassandra
   tb-core2:
     env_file:
       - tb-node.cassandra.env
     depends_on:
-      - kafka
+      - zookeeper
       - redis
       - cassandra
   tb-rule-engine1:
     env_file:
       - tb-node.cassandra.env
     depends_on:
-      - kafka
+      - zookeeper
       - redis
       - cassandra
   tb-rule-engine2:
     env_file:
       - tb-node.cassandra.env
     depends_on:
-      - kafka
+      - zookeeper
       - redis
       - cassandra
diff --git a/docker/docker-compose.kafka.yml b/docker/docker-compose.kafka.yml
new file mode 100644
index 0000000000..c9b235008b
--- /dev/null
+++ b/docker/docker-compose.kafka.yml
@@ -0,0 +1,82 @@
+#
+# Copyright © 2016-2020 The Thingsboard Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+version: '2.2'
+
+services:
+  kafka:
+    restart: always
+    image: "wurstmeister/kafka:2.12-2.3.0"
+    ports:
+      - "9092:9092"
+    env_file:
+      - kafka.env
+    depends_on:
+      - zookeeper
+  tb-js-executor:
+    env_file:
+      - queue-kafka.env
+    depends_on:
+      - kafka
+  tb-core1:
+    env_file:
+      - queue-kafka.env
+    depends_on:
+      - kafka
+      - redis
+  tb-core2:
+    env_file:
+      - queue-kafka.env
+    depends_on:
+      - kafka
+      - redis
+  tb-rule-engine1:
+    env_file:
+      - queue-kafka.env
+    depends_on:
+      - kafka
+      - redis
+  tb-rule-engine2:
+    env_file:
+      - queue-kafka.env
+    depends_on:
+      - kafka
+      - redis
+  tb-mqtt-transport1:
+    env_file:
+      - queue-kafka.env
+    depends_on:
+      - kafka
+  tb-mqtt-transport2:
+    env_file:
+      - queue-kafka.env
+    depends_on:
+      - kafka
+  tb-http-transport1:
+    env_file:
+      - queue-kafka.env
+    depends_on:
+      - kafka
+  tb-http-transport2:
+    env_file:
+      - queue-kafka.env
+    depends_on:
+      - kafka
+  tb-coap-transport:
+    env_file:
+      - queue-kafka.env
+    depends_on:
+      - kafka
diff --git a/docker/docker-compose.postgres.yml b/docker/docker-compose.postgres.yml
index 3d19e5f968..28fe5a55e2 100644
--- a/docker/docker-compose.postgres.yml
+++ b/docker/docker-compose.postgres.yml
@@ -31,27 +31,27 @@ services:
     env_file:
       - tb-node.postgres.env
     depends_on:
-      - kafka
+      - zookeeper
       - redis
       - postgres
   tb-core2:
     env_file:
       - tb-node.postgres.env
     depends_on:
-      - kafka
+      - zookeeper
       - redis
       - postgres
   tb-rule-engine1:
     env_file:
       - tb-node.postgres.env
     depends_on:
-      - kafka
+      - zookeeper
       - redis
       - postgres
   tb-rule-engine2:
     env_file:
       - tb-node.postgres.env
     depends_on:
-      - kafka
+      - zookeeper
       - redis
       - postgres
diff --git a/docker/docker-compose.pubsub.yml b/docker/docker-compose.pubsub.yml
new file mode 100644
index 0000000000..1ec178ee46
--- /dev/null
+++ b/docker/docker-compose.pubsub.yml
@@ -0,0 +1,71 @@
+#
+# Copyright © 2016-2020 The Thingsboard Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+version: '2.2'
+
+services:
+  tb-js-executor:
+    env_file:
+      - queue-pubsub.env.env
+  tb-core1:
+    env_file:
+      - queue-pubsub.env.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-core2:
+    env_file:
+      - queue-pubsub.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-rule-engine1:
+    env_file:
+      - queue-pubsub.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-rule-engine2:
+    env_file:
+      - queue-pubsub.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-mqtt-transport1:
+    env_file:
+      - queue-pubsub.env
+    depends_on:
+      - zookeeper
+  tb-mqtt-transport2:
+    env_file:
+      - queue-pubsub.env
+    depends_on:
+      - zookeeper
+  tb-http-transport1:
+    env_file:
+      - queue-pubsub.env
+    depends_on:
+      - zookeeper
+  tb-http-transport2:
+    env_file:
+      - queue-pubsub.env
+    depends_on:
+      - zookeeper
+  tb-coap-transport:
+    env_file:
+      - queue-pubsub.env
+    depends_on:
+      - zookeeper
diff --git a/docker/docker-compose.rabbitmq.yml b/docker/docker-compose.rabbitmq.yml
new file mode 100644
index 0000000000..06662b39b6
--- /dev/null
+++ b/docker/docker-compose.rabbitmq.yml
@@ -0,0 +1,71 @@
+#
+# Copyright © 2016-2020 The Thingsboard Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+version: '2.2'
+
+services:
+  tb-js-executor:
+    env_file:
+      - queue-rabbitmq.env
+  tb-core1:
+    env_file:
+      - queue-rabbitmq.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-core2:
+    env_file:
+      - queue-rabbitmq.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-rule-engine1:
+    env_file:
+      - queue-rabbitmq.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-rule-engine2:
+    env_file:
+      - queue-rabbitmq.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-mqtt-transport1:
+    env_file:
+      - queue-rabbitmq.env
+    depends_on:
+      - zookeeper
+  tb-mqtt-transport2:
+    env_file:
+      - queue-rabbitmq.env
+    depends_on:
+      - zookeeper
+  tb-http-transport1:
+    env_file:
+      - queue-rabbitmq.env
+    depends_on:
+      - zookeeper
+  tb-http-transport2:
+    env_file:
+      - queue-rabbitmq.env
+    depends_on:
+      - zookeeper
+  tb-coap-transport:
+    env_file:
+      - queue-rabbitmq.env
+    depends_on:
+      - zookeeper
\ No newline at end of file
diff --git a/docker/docker-compose.service-bus.yml b/docker/docker-compose.service-bus.yml
new file mode 100644
index 0000000000..01dd863792
--- /dev/null
+++ b/docker/docker-compose.service-bus.yml
@@ -0,0 +1,71 @@
+#
+# Copyright © 2016-2020 The Thingsboard Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+version: '2.2'
+
+services:
+  tb-js-executor:
+    env_file:
+      - queue-service-bus.env
+  tb-core1:
+    env_file:
+      - queue-service-bus.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-core2:
+    env_file:
+      - queue-service-bus.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-rule-engine1:
+    env_file:
+      - queue-service-bus.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-rule-engine2:
+    env_file:
+      - queue-service-bus.env
+    depends_on:
+      - zookeeper
+      - redis
+  tb-mqtt-transport1:
+    env_file:
+      - queue-service-bus.env
+    depends_on:
+      - zookeeper
+  tb-mqtt-transport2:
+    env_file:
+      - queue-service-bus.env
+    depends_on:
+      - zookeeper
+  tb-http-transport1:
+    env_file:
+      - queue-service-bus.env
+    depends_on:
+      - zookeeper
+  tb-http-transport2:
+    env_file:
+      - queue-service-bus.env
+    depends_on:
+      - zookeeper
+  tb-coap-transport:
+    env_file:
+      - queue-service-bus.env
+    depends_on:
+      - zookeeper
\ No newline at end of file
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 9061f3e2de..96bc0b29a6 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -26,15 +26,6 @@ services:
     environment:
       ZOO_MY_ID: 1
       ZOO_SERVERS: server.1=zookeeper:2888:3888;zookeeper:2181
-  kafka:
-    restart: always
-    image: "wurstmeister/kafka:2.12-2.3.0"
-    ports:
-      - "9092:9092"
-    env_file:
-      - kafka.env
-    depends_on:
-      - zookeeper
   redis:
     restart: always
     image: redis:4.0
@@ -43,11 +34,9 @@ services:
   tb-js-executor:
     restart: always
     image: "${DOCKER_REPO}/${JS_EXECUTOR_DOCKER_NAME}:${TB_VERSION}"
-    scale: 20
+    scale: 2
     env_file:
       - tb-js-executor.env
-    depends_on:
-      - kafka
   tb-core1:
     restart: always
     image: "${DOCKER_REPO}/${TB_NODE_DOCKER_NAME}:${TB_VERSION}"
@@ -67,7 +56,7 @@ services:
       - ./tb-node/conf:/config
       - ./tb-node/log:/var/log/thingsboard
     depends_on:
-      - kafka
+      - zookeeper
       - redis
       - tb-js-executor
       - tb-rule-engine1
@@ -91,7 +80,7 @@ services:
       - ./tb-node/conf:/config
       - ./tb-node/log:/var/log/thingsboard
     depends_on:
-      - kafka
+      - zookeeper
       - redis
       - tb-js-executor
       - tb-rule-engine1
@@ -115,7 +104,7 @@ services:
       - ./tb-node/conf:/config
       - ./tb-node/log:/var/log/thingsboard
     depends_on:
-      - kafka
+      - zookeeper
       - redis
       - tb-js-executor
   tb-rule-engine2:
@@ -137,7 +126,7 @@ services:
       - ./tb-node/conf:/config
       - ./tb-node/log:/var/log/thingsboard
     depends_on:
-      - kafka
+      - zookeeper
       - redis
       - tb-js-executor
   tb-mqtt-transport1:
@@ -153,7 +142,7 @@ services:
       - ./tb-transports/mqtt/conf:/config
       - ./tb-transports/mqtt/log:/var/log/tb-mqtt-transport
     depends_on:
-      - kafka
+      - zookeeper
   tb-mqtt-transport2:
     restart: always
     image: "${DOCKER_REPO}/${MQTT_TRANSPORT_DOCKER_NAME}:${TB_VERSION}"
@@ -167,7 +156,7 @@ services:
       - ./tb-transports/mqtt/conf:/config
       - ./tb-transports/mqtt/log:/var/log/tb-mqtt-transport
     depends_on:
-      - kafka
+      - zookeeper
   tb-http-transport1:
     restart: always
     image: "${DOCKER_REPO}/${HTTP_TRANSPORT_DOCKER_NAME}:${TB_VERSION}"
@@ -181,7 +170,7 @@ services:
       - ./tb-transports/http/conf:/config
       - ./tb-transports/http/log:/var/log/tb-http-transport
     depends_on:
-      - kafka
+      - zookeeper
   tb-http-transport2:
     restart: always
     image: "${DOCKER_REPO}/${HTTP_TRANSPORT_DOCKER_NAME}:${TB_VERSION}"
@@ -195,7 +184,7 @@ services:
       - ./tb-transports/http/conf:/config
       - ./tb-transports/http/log:/var/log/tb-http-transport
     depends_on:
-      - kafka
+      - zookeeper
   tb-coap-transport:
     restart: always
     image: "${DOCKER_REPO}/${COAP_TRANSPORT_DOCKER_NAME}:${TB_VERSION}"
@@ -209,7 +198,7 @@ services:
       - ./tb-transports/coap/conf:/config
       - ./tb-transports/coap/log:/var/log/tb-coap-transport
     depends_on:
-      - kafka
+      - zookeeper
   tb-web-ui1:
     restart: always
     image: "${DOCKER_REPO}/${WEB_UI_DOCKER_NAME}:${TB_VERSION}"
diff --git a/docker/docker-install-tb.sh b/docker/docker-install-tb.sh
index cabb3c190d..d780bd035b 100755
--- a/docker/docker-install-tb.sh
+++ b/docker/docker-install-tb.sh
@@ -41,14 +41,16 @@ set -e
 
 source compose-utils.sh
 
+ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
+
 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
 
 ADDITIONAL_STARTUP_SERVICES=$(additionalStartupServices) || exit $?
 
 if [ ! -z "${ADDITIONAL_STARTUP_SERVICES// }" ]; then
-    docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS up -d redis $ADDITIONAL_STARTUP_SERVICES
+    docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS up -d redis $ADDITIONAL_STARTUP_SERVICES
 fi
 
-docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS run --no-deps --rm -e INSTALL_TB=true -e LOAD_DEMO=${loadDemo} tb-core1
+docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS run --no-deps --rm -e INSTALL_TB=true -e LOAD_DEMO=${loadDemo} tb-core1
 
 
diff --git a/docker/docker-remove-services.sh b/docker/docker-remove-services.sh
index e935bc52e6..68f970f6b3 100755
--- a/docker/docker-remove-services.sh
+++ b/docker/docker-remove-services.sh
@@ -19,6 +19,8 @@ set -e
 
 source compose-utils.sh
 
+ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
+
 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
 
-docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS down -v
+docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS down -v
diff --git a/docker/docker-start-services.sh b/docker/docker-start-services.sh
index 08041410f5..95bd60e4ff 100755
--- a/docker/docker-start-services.sh
+++ b/docker/docker-start-services.sh
@@ -19,6 +19,8 @@ set -e
 
 source compose-utils.sh
 
+ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
+
 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
 
-docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS up -d
+docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS up -d
diff --git a/docker/docker-stop-services.sh b/docker/docker-stop-services.sh
index 492cc12f1a..e7392b38ca 100755
--- a/docker/docker-stop-services.sh
+++ b/docker/docker-stop-services.sh
@@ -19,6 +19,8 @@ set -e
 
 source compose-utils.sh
 
+ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
+
 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
 
-docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS stop
+docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS stop
diff --git a/docker/docker-update-service.sh b/docker/docker-update-service.sh
index 0182fbdcdc..0a43b14c3e 100755
--- a/docker/docker-update-service.sh
+++ b/docker/docker-update-service.sh
@@ -19,7 +19,9 @@ set -e
 
 source compose-utils.sh
 
+ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
+
 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
 
-docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS pull $@
-docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS up -d --no-deps --build $@
+docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS pull $@
+docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS up -d --no-deps --build $@
diff --git a/docker/docker-upgrade-tb.sh b/docker/docker-upgrade-tb.sh
index e62dbdc438..9d6a7243f6 100755
--- a/docker/docker-upgrade-tb.sh
+++ b/docker/docker-upgrade-tb.sh
@@ -40,12 +40,14 @@ set -e
 
 source compose-utils.sh
 
+ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
+
 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
 
 ADDITIONAL_STARTUP_SERVICES=$(additionalStartupServices) || exit $?
 
-docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS pull tb-core1
+docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS pull tb-core1
 
-docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS up -d redis $ADDITIONAL_STARTUP_SERVICES
+docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS up -d redis $ADDITIONAL_STARTUP_SERVICES
 
-docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS run --no-deps --rm -e UPGRADE_TB=true -e FROM_VERSION=${fromVersion} tb-core1
+docker-compose -f docker-compose.yml $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS run --no-deps --rm -e UPGRADE_TB=true -e FROM_VERSION=${fromVersion} tb-core1
diff --git a/docker/queue-aws-sqs.env b/docker/queue-aws-sqs.env
new file mode 100644
index 0000000000..1cb9fd65dd
--- /dev/null
+++ b/docker/queue-aws-sqs.env
@@ -0,0 +1,4 @@
+TB_QUEUE_TYPE=aws-sqs
+TB_QUEUE_AWS_SQS_ACCESS_KEY_ID=YOUR_KEY
+TB_QUEUE_AWS_SQS_SECRET_ACCESS_KEY=YOUR_SECRET
+TB_QUEUE_AWS_SQS_REGION=YOUR_REGION
diff --git a/docker/queue-kafka.env b/docker/queue-kafka.env
new file mode 100644
index 0000000000..63107942fb
--- /dev/null
+++ b/docker/queue-kafka.env
@@ -0,0 +1,2 @@
+TB_QUEUE_TYPE=kafka
+TB_KAFKA_SERVERS=kafka:9092
diff --git a/docker/queue-pubsub.env b/docker/queue-pubsub.env
new file mode 100644
index 0000000000..3bc62a1560
--- /dev/null
+++ b/docker/queue-pubsub.env
@@ -0,0 +1,3 @@
+TB_QUEUE_TYPE=pubsub
+TB_QUEUE_PUBSUB_PROJECT_ID=YOUR_PROJECT_ID
+TB_QUEUE_PUBSUB_SERVICE_ACCOUNT=YOUR_SERVICE_ACCOUNT
\ No newline at end of file
diff --git a/docker/queue-rabbitmq.env b/docker/queue-rabbitmq.env
new file mode 100644
index 0000000000..7c355a4910
--- /dev/null
+++ b/docker/queue-rabbitmq.env
@@ -0,0 +1,5 @@
+TB_QUEUE_TYPE=rabbitmq
+TB_QUEUE_RABBIT_MQ_HOST=localhost
+TB_QUEUE_RABBIT_MQ_PORT=5672
+TB_QUEUE_RABBIT_MQ_USERNAME=YOUR_USERNAME
+TB_QUEUE_RABBIT_MQ_PASSWORD=YOUR_PASSWORD
\ No newline at end of file
diff --git a/docker/queue-service-bus.env b/docker/queue-service-bus.env
new file mode 100644
index 0000000000..07bd0dc061
--- /dev/null
+++ b/docker/queue-service-bus.env
@@ -0,0 +1,4 @@
+TB_QUEUE_TYPE=service-bus
+TB_QUEUE_SERVICE_BUS_NAMESPACE_NAME=YOUR_NAMESPACE_NAME
+TB_QUEUE_SERVICE_BUS_SAS_KEY_NAME=YOUR_SAS_KEY_NAME
+TB_QUEUE_SERVICE_BUS_SAS_KEY=YOUR_SAS_KEY
\ No newline at end of file
diff --git a/docker/tb-coap-transport.env b/docker/tb-coap-transport.env
index 8a75904185..406367a192 100644
--- a/docker/tb-coap-transport.env
+++ b/docker/tb-coap-transport.env
@@ -4,6 +4,3 @@ ZOOKEEPER_URL=zookeeper:2181
 COAP_BIND_ADDRESS=0.0.0.0
 COAP_BIND_PORT=5683
 COAP_TIMEOUT=10000
-
-TB_QUEUE_TYPE=kafka
-TB_KAFKA_SERVERS=kafka:9092
\ No newline at end of file
diff --git a/docker/tb-http-transport.env b/docker/tb-http-transport.env
index e62424290f..41fb76453d 100644
--- a/docker/tb-http-transport.env
+++ b/docker/tb-http-transport.env
@@ -4,6 +4,3 @@ ZOOKEEPER_URL=zookeeper:2181
 HTTP_BIND_ADDRESS=0.0.0.0
 HTTP_BIND_PORT=8081
 HTTP_REQUEST_TIMEOUT=60000
-
-TB_QUEUE_TYPE=kafka
-TB_KAFKA_SERVERS=kafka:9092
\ No newline at end of file
diff --git a/docker/tb-js-executor.env b/docker/tb-js-executor.env
index b66073ea44..e080906549 100644
--- a/docker/tb-js-executor.env
+++ b/docker/tb-js-executor.env
@@ -1,6 +1,4 @@
-TB_QUEUE_TYPE=kafka
 REMOTE_JS_EVAL_REQUEST_TOPIC=js_eval.requests
-TB_KAFKA_SERVERS=kafka:9092
 LOGGER_LEVEL=info
 LOG_FOLDER=logs
 LOGGER_FILENAME=tb-js-executor-%DATE%.log
diff --git a/docker/tb-mqtt-transport.env b/docker/tb-mqtt-transport.env
index 54c35f355c..04f6ed8e98 100644
--- a/docker/tb-mqtt-transport.env
+++ b/docker/tb-mqtt-transport.env
@@ -4,6 +4,3 @@ ZOOKEEPER_URL=zookeeper:2181
 MQTT_BIND_ADDRESS=0.0.0.0
 MQTT_BIND_PORT=1883
 MQTT_TIMEOUT=10000
-
-TB_QUEUE_TYPE=kafka
-TB_KAFKA_SERVERS=kafka:9092
\ No newline at end of file
diff --git a/docker/tb-node.env b/docker/tb-node.env
index 12cdc7d035..bc0a3f5ee5 100644
--- a/docker/tb-node.env
+++ b/docker/tb-node.env
@@ -2,8 +2,6 @@
 
 ZOOKEEPER_ENABLED=true
 ZOOKEEPER_URL=zookeeper:2181
-TB_QUEUE_TYPE=kafka
-TB_KAFKA_SERVERS=kafka:9092
 JS_EVALUATOR=remote
 TRANSPORT_TYPE=remote
 CACHE_TYPE=redis