diff --git a/application/pom.xml b/application/pom.xml
index 557179e918..4f1d75cde2 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -128,6 +128,10 @@
             <groupId>org.thingsboard.common</groupId>
             <artifactId>edqs</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
+            <artifactId>service-info-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.thingsboard</groupId>
             <artifactId>dao</artifactId>
diff --git a/common/coap-server/pom.xml b/common/coap-server/pom.xml
index fe6ae3c64c..44f16f7329 100644
--- a/common/coap-server/pom.xml
+++ b/common/coap-server/pom.xml
@@ -46,6 +46,10 @@
             <groupId>org.thingsboard.common</groupId>
             <artifactId>data</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
+            <artifactId>service-info-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.thingsboard.common.transport</groupId>
             <artifactId>transport-api</artifactId>
diff --git a/common/edqs/pom.xml b/common/edqs/pom.xml
index 09181e796e..3b72a26442 100644
--- a/common/edqs/pom.xml
+++ b/common/edqs/pom.xml
@@ -68,6 +68,10 @@
             <groupId>org.thingsboard.common</groupId>
             <artifactId>queue</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
+            <artifactId>service-info-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
diff --git a/common/pom.xml b/common/pom.xml
index 6afae4e378..514e3eea38 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -50,6 +50,7 @@
         <module>version-control</module>
         <module>script</module>
         <module>edqs</module>
+        <module>service-info-api</module>
     </modules>
 
 </project>
diff --git a/common/queue/pom.xml b/common/queue/pom.xml
index 2e4b14e282..e689cb3dc5 100644
--- a/common/queue/pom.xml
+++ b/common/queue/pom.xml
@@ -60,6 +60,10 @@
             <groupId>org.thingsboard.common</groupId>
             <artifactId>cluster-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
+            <artifactId>service-info-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
diff --git a/common/service-info-api/pom.xml b/common/service-info-api/pom.xml
new file mode 100644
index 0000000000..c1eff7c468
--- /dev/null
+++ b/common/service-info-api/pom.xml
@@ -0,0 +1,73 @@
+<!--
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.thingsboard</groupId>
+        <version>4.1.0-SNAPSHOT</version>
+        <artifactId>common</artifactId>
+    </parent>
+    <groupId>org.thingsboard.common</groupId>
+    <artifactId>service-info-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Thingsboard Server Service Info Provider API</name>
+    <url>https://thingsboard.io</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <main.dir>${basedir}/../..</main.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
+            <artifactId>proto</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
+            <artifactId>message</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/TbServiceInfoProvider.java b/common/service-info-api/src/main/java/org/thingsboard/server/queue/discovery/TbServiceInfoProvider.java
similarity index 100%
rename from common/queue/src/main/java/org/thingsboard/server/queue/discovery/TbServiceInfoProvider.java
rename to common/service-info-api/src/main/java/org/thingsboard/server/queue/discovery/TbServiceInfoProvider.java
diff --git a/common/transport/transport-api/pom.xml b/common/transport/transport-api/pom.xml
index 2cd41064da..064c5f8ea2 100644
--- a/common/transport/transport-api/pom.xml
+++ b/common/transport/transport-api/pom.xml
@@ -60,6 +60,10 @@
             <groupId>org.thingsboard.common</groupId>
             <artifactId>util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
+            <artifactId>service-info-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
diff --git a/dao/pom.xml b/dao/pom.xml
index 67b5a36c92..a11e4e4fe3 100644
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>org.thingsboard.common</groupId>
-            <artifactId>queue</artifactId>
+            <artifactId>service-info-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
diff --git a/pom.xml b/pom.xml
index c57239c965..f8137196e4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -964,6 +964,11 @@
                 <artifactId>cluster-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.thingsboard.common</groupId>
+                <artifactId>service-info-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.thingsboard.rule-engine</groupId>
                 <artifactId>rule-engine-api</artifactId>