diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
index e1bd18c7bf..fdbbde3222 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
@@ -90,8 +90,8 @@ import org.thingsboard.server.service.notification.NotificationSchedulerService;
 import org.thingsboard.server.service.ota.OtaPackageStateService;
 import org.thingsboard.server.service.profile.TbAssetProfileCache;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
-import org.thingsboard.server.service.queue.consumer.BasicQueueConsumerManager;
-import org.thingsboard.server.service.queue.consumer.QueueConsumerManager;
+import org.thingsboard.server.queue.common.consumer.QueueConsumerManager;
+import org.thingsboard.server.service.queue.consumer.MainQueueConsumerManager;
 import org.thingsboard.server.service.queue.processing.AbstractConsumerService;
 import org.thingsboard.server.service.queue.processing.IdMsgPair;
 import org.thingsboard.server.service.resource.TbImageService;
@@ -151,9 +151,9 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
     private final TbImageService imageService;
     private final TbCoreConsumerStats stats;
 
-    private QueueConsumerManager<TbProtoQueueMsg<ToCoreMsg>, CoreQueueConfig> mainConsumer;
-    private BasicQueueConsumerManager<TbProtoQueueMsg<ToUsageStatsServiceMsg>> usageStatsConsumer;
-    private BasicQueueConsumerManager<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> firmwareStatesConsumer;
+    private MainQueueConsumerManager<TbProtoQueueMsg<ToCoreMsg>, CoreQueueConfig> mainConsumer;
+    private QueueConsumerManager<TbProtoQueueMsg<ToUsageStatsServiceMsg>> usageStatsConsumer;
+    private QueueConsumerManager<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> firmwareStatesConsumer;
 
     private volatile ListeningExecutorService deviceActivityEventsExecutor;
 
@@ -199,7 +199,7 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
         super.init("tb-core");
         this.deviceActivityEventsExecutor = MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("tb-core-device-activity-events-executor")));
 
-        this.mainConsumer = QueueConsumerManager.<TbProtoQueueMsg<ToCoreMsg>, CoreQueueConfig>builder()
+        this.mainConsumer = MainQueueConsumerManager.<TbProtoQueueMsg<ToCoreMsg>, CoreQueueConfig>builder()
                 .queueKey(new QueueKey(ServiceType.TB_CORE))
                 .config(CoreQueueConfig.of(consumerPerPartition, (int) pollInterval))
                 .msgPackProcessor(this::processMsgs)
@@ -208,19 +208,19 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
                 .scheduler(scheduler)
                 .taskExecutor(mgmtExecutor)
                 .build();
-        this.usageStatsConsumer = BasicQueueConsumerManager.<TbProtoQueueMsg<ToUsageStatsServiceMsg>>builder()
+        this.usageStatsConsumer = QueueConsumerManager.<TbProtoQueueMsg<ToUsageStatsServiceMsg>>builder()
                 .key("usage-stats")
                 .name("TB Usage Stats")
-                .pollInterval(pollInterval)
                 .msgPackProcessor(this::processUsageStatsMsg)
+                .pollInterval(pollInterval)
                 .consumerCreator(queueFactory::createToUsageStatsServiceMsgConsumer)
                 .consumerExecutor(consumersExecutor)
                 .build();
-        this.firmwareStatesConsumer = BasicQueueConsumerManager.<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>>builder()
+        this.firmwareStatesConsumer = QueueConsumerManager.<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>>builder()
                 .key("firmware")
                 .name("TB Ota Package States")
-                .pollInterval(pollInterval)
                 .msgPackProcessor(this::processFirmwareMsgs)
+                .pollInterval(pollInterval)
                 .consumerCreator(queueFactory::createToOtaPackageStateServiceMsgConsumer)
                 .consumerExecutor(consumersExecutor)
                 .build();
diff --git a/application/src/main/java/org/thingsboard/server/service/queue/consumer/QueueConsumerManager.java b/application/src/main/java/org/thingsboard/server/service/queue/consumer/MainQueueConsumerManager.java
similarity index 95%
rename from application/src/main/java/org/thingsboard/server/service/queue/consumer/QueueConsumerManager.java
rename to application/src/main/java/org/thingsboard/server/service/queue/consumer/MainQueueConsumerManager.java
index acd28f25ba..6792422b57 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/consumer/QueueConsumerManager.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/consumer/MainQueueConsumerManager.java
@@ -45,7 +45,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Slf4j
-public class QueueConsumerManager<M extends TbQueueMsg, C extends QueueConfig> {
+public class MainQueueConsumerManager<M extends TbQueueMsg, C extends QueueConfig> {
 
     protected final QueueKey queueKey;
     @Getter
@@ -65,13 +65,12 @@ public class QueueConsumerManager<M extends TbQueueMsg, C extends QueueConfig> {
     protected volatile boolean stopped;
 
     @Builder
-    public QueueConsumerManager(QueueKey queueKey,
-                                C config,
-                                MsgPackProcessor<M, C> msgPackProcessor,
-                                Function<C, TbQueueConsumer<M>> consumerCreator,
-                                ExecutorService consumerExecutor,
-                                ScheduledExecutorService scheduler,
-                                ExecutorService taskExecutor) {
+    public MainQueueConsumerManager(QueueKey queueKey, C config,
+                                    MsgPackProcessor<M, C> msgPackProcessor,
+                                    Function<C, TbQueueConsumer<M>> consumerCreator,
+                                    ExecutorService consumerExecutor,
+                                    ScheduledExecutorService scheduler,
+                                    ExecutorService taskExecutor) {
         this.queueKey = queueKey;
         this.config = config;
         this.msgPackProcessor = msgPackProcessor;
diff --git a/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java b/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java
index 79942cf6df..3c769c911a 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java
@@ -46,7 +46,7 @@ import org.thingsboard.server.service.profile.TbAssetProfileCache;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
 import org.thingsboard.server.service.queue.TbPackCallback;
 import org.thingsboard.server.service.queue.TbPackProcessingContext;
-import org.thingsboard.server.service.queue.consumer.BasicQueueConsumerManager;
+import org.thingsboard.server.queue.common.consumer.QueueConsumerManager;
 import org.thingsboard.server.service.security.auth.jwt.settings.JwtSettingsService;
 
 import java.util.List;
@@ -73,7 +73,7 @@ public abstract class AbstractConsumerService<N extends com.google.protobuf.Gene
     protected final ApplicationEventPublisher eventPublisher;
     protected final JwtSettingsService jwtSettingsService;
 
-    protected BasicQueueConsumerManager<TbProtoQueueMsg<N>> nfConsumer;
+    protected QueueConsumerManager<TbProtoQueueMsg<N>> nfConsumer;
 
     protected ExecutorService consumersExecutor;
     protected ExecutorService mgmtExecutor;
@@ -84,11 +84,11 @@ public abstract class AbstractConsumerService<N extends com.google.protobuf.Gene
         this.mgmtExecutor = ThingsBoardExecutors.newWorkStealingPool(getMgmtThreadPoolSize(), prefix + "-mgmt");
         this.scheduler = Executors.newSingleThreadScheduledExecutor(ThingsBoardThreadFactory.forName(prefix + "-consumer-scheduler"));
 
-        this.nfConsumer = BasicQueueConsumerManager.<TbProtoQueueMsg<N>>builder()
+        this.nfConsumer = QueueConsumerManager.<TbProtoQueueMsg<N>>builder()
                 .key("notifications")
                 .name("TB Notifications")
-                .pollInterval(getNotificationPollDuration())
                 .msgPackProcessor(this::processNotifications)
+                .pollInterval(getNotificationPollDuration())
                 .consumerCreator(this::createNotificationsConsumer)
                 .consumerExecutor(consumersExecutor)
                 .build();
diff --git a/application/src/main/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManager.java b/application/src/main/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManager.java
index b93313b104..c2823d3c00 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManager.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManager.java
@@ -37,7 +37,7 @@ import org.thingsboard.server.queue.discovery.QueueKey;
 import org.thingsboard.server.service.queue.TbMsgPackCallback;
 import org.thingsboard.server.service.queue.TbMsgPackProcessingContext;
 import org.thingsboard.server.service.queue.TbRuleEngineConsumerStats;
-import org.thingsboard.server.service.queue.consumer.QueueConsumerManager;
+import org.thingsboard.server.service.queue.consumer.MainQueueConsumerManager;
 import org.thingsboard.server.service.queue.processing.TbRuleEngineProcessingDecision;
 import org.thingsboard.server.service.queue.processing.TbRuleEngineProcessingResult;
 import org.thingsboard.server.service.queue.processing.TbRuleEngineProcessingStrategy;
@@ -55,7 +55,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 @Slf4j
-public class TbRuleEngineQueueConsumerManager extends QueueConsumerManager<TbProtoQueueMsg<ToRuleEngineMsg>, Queue> {
+public class TbRuleEngineQueueConsumerManager extends MainQueueConsumerManager<TbProtoQueueMsg<ToRuleEngineMsg>, Queue> {
 
     public static final String SUCCESSFUL_STATUS = "successful";
     public static final String FAILED_STATUS = "failed";
diff --git a/application/src/main/java/org/thingsboard/server/service/queue/consumer/BasicQueueConsumerManager.java b/common/queue/src/main/java/org/thingsboard/server/queue/common/consumer/QueueConsumerManager.java
similarity index 87%
rename from application/src/main/java/org/thingsboard/server/service/queue/consumer/BasicQueueConsumerManager.java
rename to common/queue/src/main/java/org/thingsboard/server/queue/common/consumer/QueueConsumerManager.java
index 4b4866c6b4..bf103bef60 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/consumer/BasicQueueConsumerManager.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/common/consumer/QueueConsumerManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.queue.consumer;
+package org.thingsboard.server.queue.common.consumer;
 
 import lombok.Builder;
 import lombok.Getter;
@@ -29,12 +29,12 @@ import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;
 
 @Slf4j
-public class BasicQueueConsumerManager<M extends TbQueueMsg> {
+public class QueueConsumerManager<M extends TbQueueMsg> {
 
     private final String key;
     private final String name;
-    private final long pollInterval;
     private final MsgPackProcessor<M> msgPackProcessor;
+    private final long pollInterval;
     private final ExecutorService consumerExecutor;
 
     @Getter
@@ -42,11 +42,9 @@ public class BasicQueueConsumerManager<M extends TbQueueMsg> {
     private volatile boolean stopped;
 
     @Builder
-    public BasicQueueConsumerManager(String key, String name,
-                                     long pollInterval,
-                                     MsgPackProcessor<M> msgPackProcessor,
-                                     Supplier<TbQueueConsumer<M>> consumerCreator,
-                                     ExecutorService consumerExecutor) {
+    public QueueConsumerManager(String key, String name, MsgPackProcessor<M> msgPackProcessor,
+                                long pollInterval, Supplier<TbQueueConsumer<M>> consumerCreator,
+                                ExecutorService consumerExecutor) {
         this.key = key;
         this.name = name;
         this.pollInterval = pollInterval;
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
index 8854ad3a7d..8f814ec052 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
@@ -20,6 +20,8 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -96,6 +98,7 @@ import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.AsyncCallbackTemplate;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
+import org.thingsboard.server.queue.common.consumer.QueueConsumerManager;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 import org.thingsboard.server.queue.discovery.TopicService;
@@ -105,14 +108,12 @@ import org.thingsboard.server.queue.scheduler.SchedulerComponent;
 import org.thingsboard.server.queue.util.AfterStartUp;
 import org.thingsboard.server.queue.util.TbTransportComponent;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Random;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
@@ -179,19 +180,17 @@ public class DefaultTransportService extends TransportActivityManager implements
     protected TbQueueRequestTemplate<TbProtoQueueMsg<TransportApiRequestMsg>, TbProtoQueueMsg<TransportApiResponseMsg>> transportApiRequestTemplate;
     protected TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> ruleEngineMsgProducer;
     protected TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> tbCoreMsgProducer;
-    protected TbQueueConsumer<TbProtoQueueMsg<ToTransportMsg>> transportNotificationsConsumer;
+    protected QueueConsumerManager<TbProtoQueueMsg<ToTransportMsg>> transportNotificationsConsumer;
 
     protected MessagesStats ruleEngineProducerStats;
     protected MessagesStats tbCoreProducerStats;
     protected MessagesStats transportApiStats;
 
     protected ExecutorService transportCallbackExecutor;
-    private ExecutorService mainConsumerExecutor;
+    private ExecutorService consumerExecutor;
 
     private final Map<String, RpcRequestMetadata> toServerRpcPendingMap = new ConcurrentHashMap<>();
 
-    private volatile boolean stopped = false;
-
     public DefaultTransportService(PartitionService partitionService,
                                    TbServiceInfoProvider serviceInfoProvider,
                                    TbTransportQueueFactory queueProvider,
@@ -232,42 +231,34 @@ public class DefaultTransportService extends TransportActivityManager implements
         transportApiRequestTemplate.setMessagesStats(transportApiStats);
         ruleEngineMsgProducer = producerProvider.getRuleEngineMsgProducer();
         tbCoreMsgProducer = producerProvider.getTbCoreMsgProducer();
-        transportNotificationsConsumer = queueProvider.createTransportNotificationsConsumer();
-        TopicPartitionInfo tpi = topicService.getNotificationsTopic(ServiceType.TB_TRANSPORT, serviceInfoProvider.getServiceId());
-        transportNotificationsConsumer.subscribe(Collections.singleton(tpi));
         transportApiRequestTemplate.init();
-        mainConsumerExecutor = Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("transport-consumer"));
+        consumerExecutor = Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("consumer"));
+        transportNotificationsConsumer = QueueConsumerManager.<TbProtoQueueMsg<ToTransportMsg>>builder()
+                .key("transport")
+                .name("TB Transport")
+                .msgPackProcessor(this::processNotificationMsgs)
+                .pollInterval(notificationsPollDuration)
+                .consumerCreator(queueProvider::createTransportNotificationsConsumer)
+                .consumerExecutor(consumerExecutor)
+                .build();
     }
 
     @AfterStartUp(order = AfterStartUp.TRANSPORT_SERVICE)
     public void start() {
-        mainConsumerExecutor.execute(() -> {
-            while (!stopped) {
-                try {
-                    List<TbProtoQueueMsg<ToTransportMsg>> records = transportNotificationsConsumer.poll(notificationsPollDuration);
-                    if (records.size() == 0) {
-                        continue;
-                    }
-                    records.forEach(record -> {
-                        try {
-                            processToTransportMsg(record.getValue());
-                        } catch (Throwable e) {
-                            log.warn("Failed to process the notification.", e);
-                        }
-                    });
-                    transportNotificationsConsumer.commit();
-                } catch (Exception e) {
-                    if (!stopped) {
-                        log.warn("Failed to obtain messages from queue.", e);
-                        try {
-                            Thread.sleep(notificationsPollDuration);
-                        } catch (InterruptedException e2) {
-                            log.trace("Failed to wait until the server has capacity to handle new requests", e2);
-                        }
-                    }
-                }
+        TopicPartitionInfo tpi = topicService.getNotificationsTopic(ServiceType.TB_TRANSPORT, serviceInfoProvider.getServiceId());
+        transportNotificationsConsumer.subscribe(Set.of(tpi));
+        transportNotificationsConsumer.launch();
+    }
+
+    private void processNotificationMsgs(List<TbProtoQueueMsg<ToTransportMsg>> msgs, TbQueueConsumer<TbProtoQueueMsg<ToTransportMsg>> consumer) {
+        msgs.forEach(msg -> {
+            try {
+                processToTransportMsg(msg.getValue());
+            } catch (Throwable e) {
+                log.warn("Failed to process the notification.", e);
             }
         });
+        consumer.commit();
     }
 
     private void invalidateRateLimits() {
@@ -276,16 +267,14 @@ public class DefaultTransportService extends TransportActivityManager implements
 
     @PreDestroy
     public void destroy() {
-        stopped = true;
-
         if (transportNotificationsConsumer != null) {
-            transportNotificationsConsumer.unsubscribe();
+            transportNotificationsConsumer.stop();
         }
         if (transportCallbackExecutor != null) {
             transportCallbackExecutor.shutdownNow();
         }
-        if (mainConsumerExecutor != null) {
-            mainConsumerExecutor.shutdownNow();
+        if (consumerExecutor != null) {
+            consumerExecutor.shutdownNow();
         }
         if (transportApiRequestTemplate != null) {
             transportApiRequestTemplate.stop();
diff --git a/common/util/src/main/java/org/thingsboard/common/util/ThingsBoardThreadFactory.java b/common/util/src/main/java/org/thingsboard/common/util/ThingsBoardThreadFactory.java
index dc263b80e7..4d0876bf8e 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/ThingsBoardThreadFactory.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/ThingsBoardThreadFactory.java
@@ -53,7 +53,7 @@ public class ThingsBoardThreadFactory implements ThreadFactory {
 
     public static void addThreadNamePrefix(String prefix) {
         String name = Thread.currentThread().getName();
-        name = prefix + name;
+        name = prefix + "-" + name;
         Thread.currentThread().setName(name);
     }
 
diff --git a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultClusterVersionControlService.java b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultClusterVersionControlService.java
index edf998dc8e..a5a7021d8d 100644
--- a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultClusterVersionControlService.java
+++ b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultClusterVersionControlService.java
@@ -21,14 +21,13 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.eclipse.jgit.errors.LargeObjectException;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.context.event.EventListener;
-import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.EntityType;
@@ -68,16 +67,16 @@ import org.thingsboard.server.gen.transport.TransportProtos.VersionedEntityInfoP
 import org.thingsboard.server.queue.TbQueueConsumer;
 import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
+import org.thingsboard.server.queue.common.consumer.QueueConsumerManager;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.TbApplicationEventListener;
 import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
 import org.thingsboard.server.queue.provider.TbVersionControlQueueFactory;
+import org.thingsboard.server.queue.util.AfterStartUp;
 import org.thingsboard.server.queue.util.TbVersionControlComponent;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -115,9 +114,8 @@ public class DefaultClusterVersionControlService extends TbApplicationEventListe
     private final Map<TenantId, PendingCommit> pendingCommitMap = new HashMap<>();
 
     private volatile ExecutorService consumerExecutor;
-    private volatile TbQueueConsumer<TbProtoQueueMsg<ToVersionControlServiceMsg>> consumer;
+    private volatile QueueConsumerManager<TbProtoQueueMsg<ToVersionControlServiceMsg>> consumer;
     private volatile TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> producer;
-    private volatile boolean stopped = false;
 
     @Value("${queue.vc.poll-interval:25}")
     private long pollDuration;
@@ -134,20 +132,26 @@ public class DefaultClusterVersionControlService extends TbApplicationEventListe
 
     @PostConstruct
     public void init() {
-        consumerExecutor = Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("vc-consumer"));
+        consumerExecutor = Executors.newCachedThreadPool(ThingsBoardThreadFactory.forName("consumer"));
         var threadFactory = ThingsBoardThreadFactory.forName("vc-io-thread");
         for (int i = 0; i < ioPoolSize; i++) {
             ioThreads.add(MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor(threadFactory)));
         }
         producer = producerProvider.getTbCoreNotificationsMsgProducer();
-        consumer = queueFactory.createToVersionControlMsgConsumer();
+        consumer = QueueConsumerManager.<TbProtoQueueMsg<ToVersionControlServiceMsg>>builder()
+                .key("vc")
+                .name("TB Version Control")
+                .msgPackProcessor(this::processMsgs)
+                .pollInterval(pollDuration)
+                .consumerCreator(queueFactory::createToVersionControlMsgConsumer)
+                .consumerExecutor(consumerExecutor)
+                .build();
     }
 
     @PreDestroy
     public void stop() {
-        stopped = true;
         if (consumer != null) {
-            consumer.unsubscribe();
+            consumer.stop();
         }
         if (consumerExecutor != null) {
             consumerExecutor.shutdownNow();
@@ -179,48 +183,29 @@ public class DefaultClusterVersionControlService extends TbApplicationEventListe
         return ServiceType.TB_VC_EXECUTOR.equals(event.getServiceType());
     }
 
-    @EventListener(ApplicationReadyEvent.class)
-    @Order(value = 2)
-    public void onApplicationEvent(ApplicationReadyEvent event) {
-        consumerExecutor.execute(() -> consumerLoop(consumer));
+    @AfterStartUp(order = 2)
+    public void afterStartUp() {
+        consumer.launch();
     }
 
-    void consumerLoop(TbQueueConsumer<TbProtoQueueMsg<ToVersionControlServiceMsg>> consumer) {
-        while (!stopped && !consumer.isStopped()) {
-            List<ListenableFuture<?>> futures = new ArrayList<>();
-            try {
-                List<TbProtoQueueMsg<ToVersionControlServiceMsg>> msgs = consumer.poll(pollDuration);
-                if (msgs.isEmpty()) {
-                    continue;
-                }
-                for (TbProtoQueueMsg<ToVersionControlServiceMsg> msgWrapper : msgs) {
-                    ToVersionControlServiceMsg msg = msgWrapper.getValue();
-                    var ctx = new VersionControlRequestCtx(msg, msg.hasClearRepositoryRequest() ? null : ProtoUtils.fromProto(msg.getVcSettings()));
-                    long startTs = System.currentTimeMillis();
-                    log.trace("[{}][{}] RECEIVED task: {}", ctx.getTenantId(), ctx.getRequestId(), msg);
-                    int threadIdx = Math.abs(ctx.getTenantId().hashCode() % ioPoolSize);
-                    ListenableFuture<Void> future = ioThreads.get(threadIdx).submit(() -> processMessage(ctx, msg));
-                    logTaskExecution(ctx, future, startTs);
-                    futures.add(future);
-                }
-                try {
-                    Futures.allAsList(futures).get(packProcessingTimeout, TimeUnit.MILLISECONDS);
-                } catch (TimeoutException e) {
-                    log.info("Timeout for processing the version control tasks.", e);
-                }
-                consumer.commit();
-            } catch (Exception e) {
-                if (!stopped) {
-                    log.warn("Failed to obtain version control requests from queue.", e);
-                    try {
-                        Thread.sleep(pollDuration);
-                    } catch (InterruptedException e2) {
-                        log.trace("Failed to wait until the server has capacity to handle new version control messages", e2);
-                    }
-                }
-            }
+    void processMsgs(List<TbProtoQueueMsg<ToVersionControlServiceMsg>> msgs, TbQueueConsumer<TbProtoQueueMsg<ToVersionControlServiceMsg>> consumer) throws Exception {
+        List<ListenableFuture<?>> futures = new ArrayList<>();
+        for (TbProtoQueueMsg<ToVersionControlServiceMsg> msgWrapper : msgs) {
+            ToVersionControlServiceMsg msg = msgWrapper.getValue();
+            var ctx = new VersionControlRequestCtx(msg, msg.hasClearRepositoryRequest() ? null : ProtoUtils.fromProto(msg.getVcSettings()));
+            long startTs = System.currentTimeMillis();
+            log.trace("[{}][{}] RECEIVED task: {}", ctx.getTenantId(), ctx.getRequestId(), msg);
+            int threadIdx = Math.abs(ctx.getTenantId().hashCode() % ioPoolSize);
+            ListenableFuture<Void> future = ioThreads.get(threadIdx).submit(() -> processMessage(ctx, msg));
+            logTaskExecution(ctx, future, startTs);
+            futures.add(future);
         }
-        log.info("TB Version Control request consumer stopped.");
+        try {
+            Futures.allAsList(futures).get(packProcessingTimeout, TimeUnit.MILLISECONDS);
+        } catch (TimeoutException e) {
+            log.info("Timeout for processing the version control tasks.", e);
+        }
+        consumer.commit();
     }
 
     private Void processMessage(VersionControlRequestCtx ctx, ToVersionControlServiceMsg msg) {
@@ -273,7 +258,7 @@ public class DefaultClusterVersionControlService extends TbApplicationEventListe
         var ids = vcService.listEntitiesAtVersion(ctx.getTenantId(), request.getVersionId(), path)
                 .stream().skip(request.getOffset()).limit(request.getLimit()).collect(Collectors.toList());
         if (!ids.isEmpty()) {
-            for (int i = 0; i < ids.size(); i++){
+            for (int i = 0; i < ids.size(); i++) {
                 VersionedEntityInfo info = ids.get(i);
                 var data = vcService.getFileContentAtCommit(ctx.getTenantId(),
                         getRelativePath(info.getExternalId().getEntityType(), info.getExternalId().getId().toString()), request.getVersionId());