diff --git a/modules/analytics/distribution/src/assembly/dist.xml b/modules/analytics/distribution/src/assembly/dist.xml
index b6df98d2..ad717a0e 100644
--- a/modules/analytics/distribution/src/assembly/dist.xml
+++ b/modules/analytics/distribution/src/assembly/dist.xml
@@ -32,6 +32,7 @@
                 <exclude>**/*.lock</exclude>
                 <exclude>**/.data</exclude>
                 <exclude>**/.settings</exclude>
+                <exclude>features/**</exclude>
             </excludes>
         </fileSet>
     </fileSets>
diff --git a/modules/broker/distribution/src/main/assembly/dist.xml b/modules/broker/distribution/src/main/assembly/dist.xml
index b1d667c6..19c42f09 100644
--- a/modules/broker/distribution/src/main/assembly/dist.xml
+++ b/modules/broker/distribution/src/main/assembly/dist.xml
@@ -30,6 +30,7 @@
                 <exclude>**/*.lock</exclude>
                 <exclude>**/.data</exclude>
                 <exclude>**/.settings</exclude>
+                <exclude>features/**</exclude>
             </excludes>
         </fileSet>
     </fileSets>
diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index 6c3d0558..0e9eb687 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -660,22 +660,6 @@
                             <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>p2-profile-generation-mqtt-gateway-profile</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>materialize-product</goal>
-                        </goals>
-                        <configuration>
-                            <productConfigurationFile>${basedir}/carbon.product</productConfigurationFile>
-                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
-                            <targetPath>
-                                file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
-                            </targetPath>
-                            <profile>mqtt-gateway</profile>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>p2-profile-generation-http-gateway-profile</id>
                         <phase>package</phase>