diff --git a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtServiceComponent.java b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtServiceComponent.java
index 9c1ae11f43..58d2385868 100644
--- a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtServiceComponent.java
+++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtServiceComponent.java
@@ -42,6 +42,39 @@ public class TenantMgtServiceComponent {
 
     private static final Log log = LogFactory.getLog(TenantManagerService.class);
 
+    @SuppressWarnings("unused")
+    @Activate
+    protected void activate(ComponentContext componentContext) {
+        try {
+            TenantManagerService tenantManagerService = new TenantManagerServiceImpl();
+            componentContext.getBundleContext().
+                    registerService(TenantManagerService.class.getName(), tenantManagerService, null);
+            TenantManagerAdminService tenantManagerAdminService = new TenantManagerAdminServiceImpl();
+            componentContext.getBundleContext().
+                    registerService(TenantManagerAdminService.class.getName(), tenantManagerAdminService, null);
+            TenantManager tenantManager = new TenantManagerImpl();
+            TenantMgtDataHolder.getInstance().setTenantManager(tenantManager);
+            DeviceMgtTenantListener deviceMgtTenantListener = new DeviceMgtTenantListener();
+            if(log.isDebugEnabled()) {
+                log.info("Tenant management listener is registering");
+            }
+            componentContext.getBundleContext().
+                    registerService(TenantMgtListener.class.getName(), deviceMgtTenantListener, null);
+            if(log.isDebugEnabled()) {
+                log.info("Tenant management service activated");
+            }
+        } catch (Throwable t) {
+            String msg = "Error occurred while activating tenant management service";
+            log.error(msg, t);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    @Deactivate
+    protected void deactivate(ComponentContext componentContext) {
+        // nothing to do
+    }
+
     @Reference(
             name = "whiteLabelManagement.service",
             service = io.entgra.device.mgt.core.device.mgt.common.metadata.mgt.WhiteLabelManagementService.class,
@@ -82,39 +115,6 @@ public class TenantMgtServiceComponent {
         TenantMgtDataHolder.getInstance().setDeviceStatusManagementService(null);
     }
 
-    @SuppressWarnings("unused")
-    @Activate
-    protected void activate(ComponentContext componentContext) {
-        try {
-            TenantManagerService tenantManagerService = new TenantManagerServiceImpl();
-            componentContext.getBundleContext().
-                    registerService(TenantManagerService.class.getName(), tenantManagerService, null);
-            TenantManagerAdminService tenantManagerAdminService = new TenantManagerAdminServiceImpl();
-            componentContext.getBundleContext().
-                    registerService(TenantManagerAdminService.class.getName(), tenantManagerAdminService, null);
-            TenantManager tenantManager = new TenantManagerImpl();
-            TenantMgtDataHolder.getInstance().setTenantManager(tenantManager);
-            DeviceMgtTenantListener deviceMgtTenantListener = new DeviceMgtTenantListener();
-            if(log.isDebugEnabled()) {
-                log.info("Tenant management listener is registering");
-            }
-            componentContext.getBundleContext().
-                    registerService(TenantMgtListener.class.getName(), deviceMgtTenantListener, null);
-            if(log.isDebugEnabled()) {
-                log.info("Tenant management service activated");
-            }
-        } catch (Throwable t) {
-            String msg = "Error occurred while activating tenant management service";
-            log.error(msg, t);
-        }
-    }
-
-    @SuppressWarnings("unused")
-    @Deactivate
-    protected void deactivate(ComponentContext componentContext) {
-        // nothing to do
-    }
-
     @Reference(
             name = "application.mgr",
             service = io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager.class,