diff --git a/docker/compose-utils.sh b/docker/compose-utils.sh
index 995cd5a596..05a91257a2 100755
--- a/docker/compose-utils.sh
+++ b/docker/compose-utils.sh
@@ -42,20 +42,8 @@ function additionalComposeQueueArgs() {
confluent)
ADDITIONAL_COMPOSE_QUEUE_ARGS="-f docker-compose.confluent.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 TB_QUEUE_TYPE value specified in the .env file: '${TB_QUEUE_TYPE}'. Should be either 'kafka' or 'confluent' or 'aws-sqs' or 'pubsub' or 'rabbitmq' or 'service-bus'." >&2
+ echo "Unknown Queue service TB_QUEUE_TYPE value specified in the .env file: '${TB_QUEUE_TYPE}'. Should be either 'kafka' or 'confluent'." >&2
exit 1
esac
echo $ADDITIONAL_COMPOSE_QUEUE_ARGS
diff --git a/docker/docker-compose.aws-sqs.yml b/docker/docker-compose.aws-sqs.yml
deleted file mode 100644
index c86c4f73ad..0000000000
--- a/docker/docker-compose.aws-sqs.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright © 2016-2025 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: '3.0'
-
-services:
- tb-js-executor:
- env_file:
- - queue-aws-sqs.env
- tb-core1:
- env_file:
- - queue-aws-sqs.env
- tb-core2:
- env_file:
- - queue-aws-sqs.env
- tb-rule-engine1:
- env_file:
- - queue-aws-sqs.env
- tb-rule-engine2:
- env_file:
- - queue-aws-sqs.env
- tb-mqtt-transport1:
- env_file:
- - queue-aws-sqs.env
- tb-mqtt-transport2:
- env_file:
- - queue-aws-sqs.env
- tb-http-transport1:
- env_file:
- - queue-aws-sqs.env
- tb-http-transport2:
- env_file:
- - queue-aws-sqs.env
- tb-coap-transport:
- env_file:
- - queue-aws-sqs.env
- tb-lwm2m-transport:
- env_file:
- - queue-aws-sqs.env
- tb-snmp-transport:
- env_file:
- - queue-aws-sqs.env
- tb-vc-executor1:
- env_file:
- - queue-aws-sqs.env
- tb-vc-executor2:
- env_file:
- - queue-aws-sqs.env
diff --git a/docker/docker-compose.pubsub.yml b/docker/docker-compose.pubsub.yml
deleted file mode 100644
index ee276c786c..0000000000
--- a/docker/docker-compose.pubsub.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright © 2016-2025 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: '3.0'
-
-services:
- tb-js-executor:
- env_file:
- - queue-pubsub.env
- tb-core1:
- env_file:
- - queue-pubsub.env
- tb-core2:
- env_file:
- - queue-pubsub.env
- tb-rule-engine1:
- env_file:
- - queue-pubsub.env
- tb-rule-engine2:
- env_file:
- - queue-pubsub.env
- tb-mqtt-transport1:
- env_file:
- - queue-pubsub.env
- tb-mqtt-transport2:
- env_file:
- - queue-pubsub.env
- tb-http-transport1:
- env_file:
- - queue-pubsub.env
- tb-http-transport2:
- env_file:
- - queue-pubsub.env
- tb-coap-transport:
- env_file:
- - queue-pubsub.env
- tb-lwm2m-transport:
- env_file:
- - queue-pubsub.env
- tb-snmp-transport:
- env_file:
- - queue-pubsub.env
- tb-vc-executor1:
- env_file:
- - queue-pubsub.env
- tb-vc-executor2:
- env_file:
- - queue-pubsub.env
diff --git a/docker/docker-compose.rabbitmq.yml b/docker/docker-compose.rabbitmq.yml
deleted file mode 100644
index ed528ce098..0000000000
--- a/docker/docker-compose.rabbitmq.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright © 2016-2025 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: '3.0'
-
-services:
- tb-js-executor:
- env_file:
- - queue-rabbitmq.env
- tb-core1:
- env_file:
- - queue-rabbitmq.env
- tb-core2:
- env_file:
- - queue-rabbitmq.env
- tb-rule-engine1:
- env_file:
- - queue-rabbitmq.env
- tb-rule-engine2:
- env_file:
- - queue-rabbitmq.env
- tb-mqtt-transport1:
- env_file:
- - queue-rabbitmq.env
- tb-mqtt-transport2:
- env_file:
- - queue-rabbitmq.env
- tb-http-transport1:
- env_file:
- - queue-rabbitmq.env
- tb-http-transport2:
- env_file:
- - queue-rabbitmq.env
- tb-coap-transport:
- env_file:
- - queue-rabbitmq.env
- tb-lwm2m-transport:
- env_file:
- - queue-rabbitmq.env
- tb-snmp-transport:
- env_file:
- - queue-rabbitmq.env
- tb-vc-executor1:
- env_file:
- - queue-rabbitmq.env
- tb-vc-executor2:
- env_file:
- - queue-rabbitmq.env
diff --git a/docker/docker-compose.service-bus.yml b/docker/docker-compose.service-bus.yml
deleted file mode 100644
index d3e1e0d34c..0000000000
--- a/docker/docker-compose.service-bus.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright © 2016-2025 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: '3.0'
-
-services:
- tb-js-executor:
- env_file:
- - queue-service-bus.env
- tb-core1:
- env_file:
- - queue-service-bus.env
- tb-core2:
- env_file:
- - queue-service-bus.env
- tb-rule-engine1:
- env_file:
- - queue-service-bus.env
- tb-rule-engine2:
- env_file:
- - queue-service-bus.env
- tb-mqtt-transport1:
- env_file:
- - queue-service-bus.env
- tb-mqtt-transport2:
- env_file:
- - queue-service-bus.env
- tb-http-transport1:
- env_file:
- - queue-service-bus.env
- tb-http-transport2:
- env_file:
- - queue-service-bus.env
- tb-coap-transport:
- env_file:
- - queue-service-bus.env
- tb-lwm2m-transport:
- env_file:
- - queue-service-bus.env
- tb-snmp-transport:
- env_file:
- - queue-service-bus.env
- tb-vc-executor1:
- env_file:
- - queue-service-bus.env
- tb-vc-executor2:
- env_file:
- - queue-service-bus.env
diff --git a/docker/queue-aws-sqs.env b/docker/queue-aws-sqs.env
deleted file mode 100644
index 1cb9fd65dd..0000000000
--- a/docker/queue-aws-sqs.env
+++ /dev/null
@@ -1,4 +0,0 @@
-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-pubsub.env b/docker/queue-pubsub.env
deleted file mode 100644
index 5b4aeba73b..0000000000
--- a/docker/queue-pubsub.env
+++ /dev/null
@@ -1,3 +0,0 @@
-TB_QUEUE_TYPE=pubsub
-TB_QUEUE_PUBSUB_PROJECT_ID=YOUR_PROJECT_ID
-TB_QUEUE_PUBSUB_SERVICE_ACCOUNT=YOUR_SERVICE_ACCOUNT
diff --git a/docker/queue-rabbitmq.env b/docker/queue-rabbitmq.env
deleted file mode 100644
index 7c355a4910..0000000000
--- a/docker/queue-rabbitmq.env
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index f54ce7e2fc..0000000000
--- a/docker/queue-service-bus.env
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/docker/tb-node/conf/logback.xml b/docker/tb-node/conf/logback.xml
index c17e8a43cf..314f88a406 100644
--- a/docker/tb-node/conf/logback.xml
+++ b/docker/tb-node/conf/logback.xml
@@ -67,8 +67,6 @@
-
-
diff --git a/docker/tb-transports/coap/conf/logback.xml b/docker/tb-transports/coap/conf/logback.xml
index b63b1e5384..43c6d4c4c8 100644
--- a/docker/tb-transports/coap/conf/logback.xml
+++ b/docker/tb-transports/coap/conf/logback.xml
@@ -42,8 +42,6 @@
-
-
diff --git a/docker/tb-transports/http/conf/logback.xml b/docker/tb-transports/http/conf/logback.xml
index 2ef46344e4..14fe7faff8 100644
--- a/docker/tb-transports/http/conf/logback.xml
+++ b/docker/tb-transports/http/conf/logback.xml
@@ -42,8 +42,6 @@
-
-
diff --git a/docker/tb-transports/lwm2m/conf/logback.xml b/docker/tb-transports/lwm2m/conf/logback.xml
index 10e34129df..db0f40bb05 100644
--- a/docker/tb-transports/lwm2m/conf/logback.xml
+++ b/docker/tb-transports/lwm2m/conf/logback.xml
@@ -42,7 +42,6 @@
-
diff --git a/docker/tb-transports/mqtt/conf/logback.xml b/docker/tb-transports/mqtt/conf/logback.xml
index e259f9fd56..81433a2d91 100644
--- a/docker/tb-transports/mqtt/conf/logback.xml
+++ b/docker/tb-transports/mqtt/conf/logback.xml
@@ -42,7 +42,6 @@
-
diff --git a/docker/tb-transports/snmp/conf/logback.xml b/docker/tb-transports/snmp/conf/logback.xml
index 201049e174..8d3472a9d8 100644
--- a/docker/tb-transports/snmp/conf/logback.xml
+++ b/docker/tb-transports/snmp/conf/logback.xml
@@ -42,7 +42,6 @@
-
diff --git a/docker/tb-vc-executor/conf/logback.xml b/docker/tb-vc-executor/conf/logback.xml
index f511b8b932..42420a3e4a 100644
--- a/docker/tb-vc-executor/conf/logback.xml
+++ b/docker/tb-vc-executor/conf/logback.xml
@@ -42,7 +42,6 @@
-