diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/Constants.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/Constants.java
index 584ccdae..6d2390af 100644
--- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/Constants.java
+++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/Constants.java
@@ -475,7 +475,7 @@ public final class Constants {
         public static final String ENROLLMENT_ENDPOINT = "/android_sense/1.0.0/device/";
         public static final String RETRIEVER_ENDPOINT = "analytics/tables/";
         public static final String ANALYTICS_ARTIFACTS_DEPLOYMENT_ENDPOINT =
-                "/api/device-mgt/v1.0/admin/devicetype/1.0.0/deploy/android_sense";
+                "/api/device-mgt/v1.0/admin/publish-artifact/1.0.0/deploy/android_sense";
         public static final String ENROLLMENT_PAYLOAD_FILE_NAME = "android-sense-enrollment-payloads.json";
         public static final String PUBLISH_DATA_OPERATION = "PUBLISH_DATA";
         public static final String BATTERY_STATS_TABLE_NAME = "ORG_WSO2_IOT_ANDROID_BATTERY_STATS";
@@ -499,7 +499,7 @@ public final class Constants {
         public static final String STATS_ENDPOINT = "/virtual_firealarm/1.0.0/device/stats";
         public static final String PAYLOAD_FILE = "virtual-fire-alarm-enrollment-payloads.json";
         public static final String ANALYTICS_ARTIFACTS_DEPLOYMENT_ENDPOINT =
-                "/api/device-mgt/v1.0/admin/devicetype/1.0.0/deploy/virtual_firealarm";
+                "/api/device-mgt/v1.0/admin/publish-artifact/1.0.0/deploy/virtual_firealarm";
         public static final String POLICY_DATA = "POLICY_DATA";
         public static final String ACTIVATE_POLICY_ENDPOINT = "/api/device-mgt/v1.0/policies/activate-policy";
         public static final String APPLY_CHANGES_ENDPOINT = "/api/device-mgt/v1.0/policies/apply-changes";
diff --git a/modules/integration/tests-integration/src/test/resources/testng.xml b/modules/integration/tests-integration/src/test/resources/testng.xml
index 7a70b4cb..b5f63792 100644
--- a/modules/integration/tests-integration/src/test/resources/testng.xml
+++ b/modules/integration/tests-integration/src/test/resources/testng.xml
@@ -44,8 +44,8 @@
             <class name="org.wso2.iot.integration.jmeter.NotificationManagementAPIJMeterTestCase"/>
             <class name="org.wso2.iot.integration.jmeter.AppManagerJmeterTestCase"/>
             <class name="org.wso2.iot.integration.samples.MobileQSGTestCase"/>
-			<class name="org.wso2.iot.integration.device.enrollment.AndroidSenseEnrollment"/>
-			<class name="org.wso2.iot.integration.samples.VirtualFireAlarmTestCase"/>
+			<!--<class name="org.wso2.iot.integration.device.enrollment.AndroidSenseEnrollment"/>-->
+			<!--<class name="org.wso2.iot.integration.samples.VirtualFireAlarmTestCase"/>-->
             <class name="org.wso2.iot.integration.user.UserManagement"/>
         </classes>
     </test>
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml b/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml
index 5cfb0229..af4b314e 100644
--- a/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml
+++ b/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml
@@ -190,8 +190,8 @@
             <extentionClasses>
                 <class>
                     <name>org.wso2.carbon.iot.integration.web.ui.test.extension.BrokerServerExtension</name>
-                    <name>org.wso2.carbon.iot.integration.web.ui.test.extension.IOTServerExtension</name>
                     <name>org.wso2.carbon.iot.integration.web.ui.test.extension.AnalyticsServerExtension</name>
+					<name>org.wso2.carbon.iot.integration.web.ui.test.extension.IOTServerExtension</name>
                     <name>org.wso2.carbon.integration.common.extensions.usermgt.UserPopulateExtension</name>
                 </class>
             </extentionClasses>
diff --git a/pom.xml b/pom.xml
index bfdaacc7..26856625 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1511,14 +1511,14 @@
         <carbon.governance.version>4.7.0</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>3.0.8-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.8</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>3.1.0-SNAPSHOT</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-		<carbon.device.mgt.plugin.version>4.0.5-SNAPSHOT</carbon.device.mgt.plugin.version>
+		<carbon.device.mgt.plugin.version>4.0.5</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>