diff --git a/product/modules/agents/android/jax-rs/pom.xml b/product/modules/agents/android/jax-rs/pom.xml
index 306d7c24d..427747049 100644
--- a/product/modules/agents/android/jax-rs/pom.xml
+++ b/product/modules/agents/android/jax-rs/pom.xml
@@ -20,7 +20,7 @@
org.wso2.cdmserver
- wso2cdmserver-parent
+ wso2cdmserver-product
2.0.0-SNAPSHOT
../../../../pom.xml
@@ -47,7 +47,7 @@
maven-war-plugin
2.2
- WEB-INF/lib/*.jar
+ WEB-INF/lib/*cxf*.jar
${project.artifactId}
diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml
index 2b569559c..eee52239e 100644
--- a/product/modules/distribution/src/assembly/bin.xml
+++ b/product/modules/distribution/src/assembly/bin.xml
@@ -323,12 +323,12 @@
wso2cdm-${project.version}/repository/conf/multitenancy/
true
-
+
wso2cdm-${project.version}/repository/conf/security/
diff --git a/product/pom.xml b/product/pom.xml
index ecd5db07f..c9fbafc3d 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -34,6 +34,7 @@
WSO2 Connected Device Manager (CDM) - Parent
+
modules/p2-profile-gen
modules/distribution
modules/integration