diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index f6b1596a..72bf6a29 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -301,6 +301,7 @@ d                                        <exclude name="**/shindig.properties" /
 							<filters>
 								<filter>${basedir}/src/assembly/filter.properties</filter>
 							</filters>
+							<escapeString>\</escapeString>
 							<descriptors>
 								<descriptor>${basedir}/src/assembly/bin.xml</descriptor>
 							</descriptors>
diff --git a/modules/distribution/src/samples-deployer.xml b/modules/distribution/src/samples-deployer.xml
index 1b85ce08..92d8bac7 100644
--- a/modules/distribution/src/samples-deployer.xml
+++ b/modules/distribution/src/samples-deployer.xml
@@ -46,8 +46,8 @@
                             <goal>p2-repo-gen</goal>
                         </goals>
                         <configuration>
-                            <metadataRepository>file:${basedir}/samples/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/samples/p2-repo</artifactRepository>
+                            <metadataRepository>file:\${basedir}/samples/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${basedir}/samples/p2-repo</artifactRepository>
                             <publishArtifacts>true</publishArtifacts>
                             <publishArtifactRepository>true</publishArtifactRepository>
 
@@ -78,8 +78,8 @@
                         </goals>
                         <configuration>
                             <profile>devicetype-publisher</profile>
-                            <metadataRepository>file:${basedir}/samples/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/samples/p2-repo</artifactRepository>
+                            <metadataRepository>file:\${basedir}/samples/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${basedir}/samples/p2-repo</artifactRepository>
                             <destination>repository/components</destination>
                             <deleteOldProfileFiles>false</deleteOldProfileFiles>
                             <features>
@@ -114,8 +114,8 @@
                         </goals>
                         <configuration>
                             <profile>default</profile>
-                            <metadataRepository>file:${basedir}/samples/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/samples/p2-repo</artifactRepository>
+                            <metadataRepository>file:\${basedir}/samples/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${basedir}/samples/p2-repo</artifactRepository>
                             <destination>repository/components</destination>
                             <deleteOldProfileFiles>false</deleteOldProfileFiles>
                             <features>
diff --git a/modules/distribution/src/samples/connectedcup/pom.xml b/modules/distribution/src/samples/connectedcup/pom.xml
index 2a77321c..6f6f6caf 100644
--- a/modules/distribution/src/samples/connectedcup/pom.xml
+++ b/modules/distribution/src/samples/connectedcup/pom.xml
@@ -31,7 +31,7 @@
 
     <groupId>org.coffeeking</groupId>
     <artifactId>device.mgt.iot.connectedcup-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>${project.version}</version>
     <packaging>pom</packaging>
     <name>WSO2 IoTS(Device Types) - Connected Cup Component</name>
     <description>WSO2 IoTS(Device Types) - Connected Cup Component</description>
diff --git a/modules/distribution/src/samples/installer/device-deployer.xml b/modules/distribution/src/samples/installer/device-deployer.xml
index 102218ae..1029f857 100644
--- a/modules/distribution/src/samples/installer/device-deployer.xml
+++ b/modules/distribution/src/samples/installer/device-deployer.xml
@@ -51,8 +51,8 @@
                             <goal>p2-repo-gen</goal>
                         </goals>
                         <configuration>
-                            <metadataRepository>file:${basedir}/samples/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/samples/p2-repo</artifactRepository>
+                            <metadataRepository>file:\${basedir}/samples/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${basedir}/samples/p2-repo</artifactRepository>
                             <publishArtifacts>true</publishArtifacts>
                             <publishArtifactRepository>true</publishArtifactRepository>
 
@@ -80,8 +80,8 @@
                         </goals>
                         <configuration>
                             <profile>default</profile>
-                            <metadataRepository>file:${basedir}/samples/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/samples/p2-repo</artifactRepository>
+                            <metadataRepository>file:\${basedir}/samples/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${basedir}/samples/p2-repo</artifactRepository>
                             <destination>repository/components</destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
@@ -100,8 +100,8 @@
                         </goals>
                         <configuration>
                             <profile>devicetype-publisher</profile>
-                            <metadataRepository>file:${basedir}/samples/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/samples/p2-repo</artifactRepository>
+                            <metadataRepository>file:\${basedir}/samples/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${basedir}/samples/p2-repo</artifactRepository>
                             <destination>repository/components</destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>