diff --git a/iot-core/pom.xml b/iot-core/pom.xml
index 0b99fd0..65d0662 100644
--- a/iot-core/pom.xml
+++ b/iot-core/pom.xml
@@ -357,6 +357,12 @@
                                     org.wso2.carbon.devicemgt:io.entgra.device.mgt.core.apimgt.analytics.extension.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <!-- End of APIM analytics extension feature-->
+
+                                <!-- Tenant Management Feature -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:io.entgra.tenant.mgt.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <!-- End of Tenant Management Feature -->
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -534,6 +540,12 @@
                                     <id>io.entgra.device.mgt.core.apimgt.analytics.extension.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+
+                                <!-- Tenant Management -->
+                                <feature>
+                                    <id>io.entgra.tenant.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>