diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index 0dbfd1e9..d63a842c 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -443,7 +443,7 @@
 
                                 <!-- IoT Server Features -->
                                 <featureArtifactDef>
-                                    org.wso2.iot:org.wso2.iot.core.styles.feature:${product.iot.version}
+                                    org.wso2.iot:org.wso2.iot.core.styles.feature:${project.version}
                                 </featureArtifactDef>
 
                                 <!-- Mobile Device Management Features -->
@@ -868,7 +868,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.iot.core.styles.feature.group</id>
-                                    <version>${product.iot.version}</version>
+                                    <version>${project.version}</version>
                                 </feature>
                                 <!-- End of IoTServer Features -->
                                 <!-- Mobile Features -->
@@ -1663,7 +1663,7 @@
                                 <!-- IoTServer Features -->
                                 <feature>
                                     <id>org.wso2.iot.core.styles.feature.group</id>
-                                    <version>${product.iot.version}</version>
+                                    <version>${project.version}</version>
                                 </feature>
                                 <!-- End of IoTServer Features -->
                                 <feature>
@@ -1889,7 +1889,7 @@
                                 <!-- IoTServer Features -->
                                 <feature>
                                     <id>org.wso2.iot.core.styles.feature.group</id>
-                                    <version>${product.iot.version}</version>
+                                    <version>${project.version}</version>
                                 </feature>
                                 <!-- End of IoTServer Features -->
                                 <!-- App management features-->
@@ -2558,7 +2558,7 @@
                                 <!-- IoTServer Features -->
                                 <feature>
                                     <id>org.wso2.iot.core.styles.feature.group</id>
-                                    <version>${product.iot.version}</version>
+                                    <version>${project.version}</version>
                                 </feature>
                                 <!-- End of IoTServer Features -->
 
diff --git a/pom.xml b/pom.xml
index eadae25b..5f742fda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1515,7 +1515,7 @@
         <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>
+        <product.iot.version>${project.version}</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
 	    <carbon.device.mgt.plugin.version>4.0.8</carbon.device.mgt.plugin.version>
@@ -1531,7 +1531,7 @@
         <carbon.analytics.common.version>5.1.17</carbon.analytics.common.version>
         <carbon.analytics.version>1.3.3</carbon.analytics.version>
         <carbon.analytics.das.version>1.3.5</carbon.analytics.das.version>
-        <product.iot.analytics.version>${product.iot.version}</product.iot.analytics.version>
+        <product.iot.analytics.version>${project.version}</product.iot.analytics.version>
         <product.das.version>3.1.0</product.das.version>
         <product.mb.version>3.1.0</product.mb.version>
 
@@ -1548,7 +1548,7 @@
         <orbit.version.rampart>1.6.1.wso2v10</orbit.version.rampart>
 
         <!-- IoT Broker Dependencies -->
-        <product.iot.broker.version>${product.iot.version}</product.iot.broker.version>
+        <product.iot.broker.version>${project.version}</product.iot.broker.version>
         <andes.version>3.2.19</andes.version>
         <carbon.messaging.version>3.2.15</carbon.messaging.version>