diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties
index 34dced0a..e27e6d46 100644
--- a/modules/distribution/src/assembly/filter.properties
+++ b/modules/distribution/src/assembly/filter.properties
@@ -29,7 +29,3 @@ cdmf.platform.role=CDMFPlatform
 cdmf.analytics.role=CDMFAnalytics
 geodashboard.role=GeoDashboard
 bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator
-carbon-device-mgt-plugin-version=4.0.5
-carbon-device-mgt-version=3.0.8
-carbon-analytics-version=1.3.3
-carbon-kernel-version=4.4.14
diff --git a/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml b/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
index 39967e5e..979eaf69 100644
--- a/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
+++ b/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
@@ -243,7 +243,7 @@
         </repository>
     </repositories>
     <properties>
-        <carbon.device.mgt.plugin.version>@carbon-device-mgt-plugin-version@</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>${carbon.device.mgt.plugin.version}</carbon.device.mgt.plugin.version>
         <org.coffeeking.version>1.0.0</org.coffeeking.version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/modules/distribution/src/core/samples/connectedcup/pom.xml b/modules/distribution/src/core/samples/connectedcup/pom.xml
index a523157f..ba39b3c7 100644
--- a/modules/distribution/src/core/samples/connectedcup/pom.xml
+++ b/modules/distribution/src/core/samples/connectedcup/pom.xml
@@ -359,13 +359,8 @@
 
 
     <properties>
-        <carbon.kernel.version>4.4.14</carbon.kernel.version>
-
-        <org.coffeeking.version>1.0.0</org.coffeeking.version>
-
-        <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>3.0.8</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>4.0.5</carbon.device.mgt.plugin.version>
+        <carbon.kernel.version>${carbon.kernel.version}</carbon.kernel.version>
+        <carbon.device.mgt.version>${carbon.device.mgt.version}</carbon.device.mgt.version>
 
         <paho.mqtt.version>1.0.2</paho.mqtt.version>
         <commons-json.version>3.0.0.wso2v1</commons-json.version>