diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index a35409da..51738825 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -244,7 +244,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/devicemgt
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources
             </outputDirectory>
diff --git a/modules/samples/installer/device-deployer.xml b/modules/samples/installer/device-deployer.xml
index 0827112a..3c6a8de5 100644
--- a/modules/samples/installer/device-deployer.xml
+++ b/modules/samples/installer/device-deployer.xml
@@ -55,7 +55,7 @@
 
 							<featureArtifacts>
 								<featureArtifactDef>
-									{FEATURE_ARTIFACT_DEF}.feature:{FEATURE_VERSION}
+									{FEATURE_GROUP_ID}:{FEATURE_ARTIFACT_DEF}:{FEATURE_VERSION}
 								</featureArtifactDef>
 							</featureArtifacts>
 						</configuration>
@@ -84,7 +84,7 @@
 							<deleteOldProfileFiles>true</deleteOldProfileFiles>
 							<features>
 								<feature>
-									<id>{FEATURE_ARTIFACT_DEF}.feature.group</id>
+									<id>{FEATURE_ARTIFACT_DEF}.group</id>
 									<version>{FEATURE_VERSION}</version>
 								</feature>
 							</features>