diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 3988dad4..c15b7310 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -455,7 +455,6 @@
                                     <fileset dir="src/repository/conf/datasources"/>
                                     <!-- Copy master-datasources.xml and cdm-datasources.xml to target -->
                                 </copy>
-
                                 <!--<copy todir="target/wso2carbon-core-${carbon.kernel.version}/modules" overwrite="true">
                                     <fileset dir="src/repository/modules"></fileset>
                                 </copy>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 52a6f7b6..897e59b4 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -458,6 +458,15 @@
             </includes>
         </fileSet>
 
+        <!--============ Added with ES Features ===============-->
+			<!--Copies publisher specific config files that needs to be overriden for the CDMF-STORE. -->
+				<!--These files are already provided in the CDMF-Store feature too. -->
+				<!--However, given that the order of feature installation cannot be controlled, they are recopied at the product level.-->
+
+        <fileSet>
+            <directory>src/publisher/config</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/publisher/config</outputDirectory>
+        </fileSet>
         <!--========================================================================================================-->
         <!-- End of Enterprise Store Features -->
 
diff --git a/modules/distribution/src/publisher/config/publisher-tenant.json b/modules/distribution/src/publisher/config/publisher-tenant.json
new file mode 100644
index 00000000..2ee3d3be
--- /dev/null
+++ b/modules/distribution/src/publisher/config/publisher-tenant.json
@@ -0,0 +1,68 @@
+{
+  "roles": {
+    "Internal/publisher": {
+      "/permission/admin/login": ["ui.execute"]
+    },
+    "Internal/reviewer": {
+      "/permission/admin/login": ["ui.execute"]
+    }
+  },
+  "user": {
+    "username": "admin",
+    "password": "admin"
+  },
+  "application": {
+    "landingPage": "/assets/gadget/list"
+  },
+  "features": {
+    "assetTypesHotDelploy": {
+      "enabled": false
+    }
+  },
+  "assets":["gadget","site", "device"],
+  "disabledAssets":[],
+  "userRoles": ["Internal/publisher"],
+  "permissions": {
+    "login": {
+      "/permission/admin/login": ["ui.execute"]
+    }
+  },
+  "userSpace": "/_system/governance/users",
+  "accessible": [{
+    "context": "/_system/governance",
+    "collections": ["gadgets", "sites", "ebooks", "devices"],
+    "actions": ["http://www.wso2.org/projects/registry/actions/get", "http://www.wso2.org/projects/registry/actions/add", "http://www.wso2.org/projects/registry/actions/delete", "authorize"]
+  }],
+  "app": {
+    "RXT_MANAGER": "rxt_manager",
+    "ROUTE_MANAGER": "route_manager",
+    "MODEL_MANAGER": "model_manager"
+  },
+  "paths": {
+    "ASSET_EXT_PATH": "/assets",
+    "ASSET_DEFAULT_PATH": "/assets/default",
+    "ASSETS_EXT_PATH": "/assets",
+    "ASSETS_DEFAULT_PATH": "/assets/default",
+    "RXT_EXTENSION_PATH": "/config/ext/"
+  },
+  "urls": {
+    "ASSET": "/asset",
+    "ASSETS": "/assets"
+  },
+  "defaultAssets": {
+    "root": "/samples/assets",
+    "assetData": [{
+      "type": "gadgets",
+      "ignore": ["agricultural-land", "intro-gadget-1", "intro-gadget-2", "gadget-template-explorer", "gadget-explorer", "co2-emission", "electric-power", "energy-use", "greenhouse-gas"]
+    }, {
+      "type": "ebooks"
+    }, {
+      "type": "sites"
+    }, {
+      "type": "devices"
+    }]
+  },
+  "router": {
+    "RENDERER": "/modules/router.caramel-renderer.js"
+  }
+}
diff --git a/modules/samples/arduino/artifact/arduino_banner.png b/modules/samples/arduino/artifact/arduino_banner.png
new file mode 100644
index 00000000..537d2a6e
Binary files /dev/null and b/modules/samples/arduino/artifact/arduino_banner.png differ
diff --git a/modules/samples/arduino/artifact/arduino_thumbnail.png b/modules/samples/arduino/artifact/arduino_thumbnail.png
new file mode 100644
index 00000000..a59f3a70
Binary files /dev/null and b/modules/samples/arduino/artifact/arduino_thumbnail.png differ
diff --git a/modules/samples/arduino/artifact/device.json b/modules/samples/arduino/artifact/device.json
new file mode 100644
index 00000000..4bfd2298
--- /dev/null
+++ b/modules/samples/arduino/artifact/device.json
@@ -0,0 +1,18 @@
+{
+  "name": "Arduino",
+  "tags": "WSO2, IoT, Arduino, ArduinoUno",
+  "rate": 3,
+  "attributes": {
+    "overview_status": "PUBLISHED",
+    "overview_provider": "admin",
+    "overview_name": "Arduino",
+    "overview_version": "1.0.0",
+    "overview_board": "Arduino",
+    "overview_url": "https://204.232.188.214:9443/iotserver/devices/arduino",
+    "overview_model": "Arduino Uno",
+    "overview_defaultOs": "Cross-Platform",
+    "overview_description": "This is a bare-board Arduino Device-Type. The board used here is Arduino Uno.",
+    "images_thumbnail": "/arduino/arduino_thumbnail.png",
+    "images_banner": "/arduino/arduino_banner.png"
+  }
+}
\ No newline at end of file
diff --git a/modules/samples/arduino/build.xml b/modules/samples/arduino/build.xml
index 8dfd9c4a..05fee9b4 100644
--- a/modules/samples/arduino/build.xml
+++ b/modules/samples/arduino/build.xml
@@ -65,6 +65,11 @@
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
+        <mkdir dir="${target.sample.device.dir}/${sample_type}"/>
+        <copy toDir="${target.sample.device.dir}/${sample_type}">
+            <fileset dir="artifact/"/>
+        </copy>
+
         <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
         <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
         <copy file="page/${sample_type}.hbs" toDir="${target.page.dir}" overwrite="yes"/>
diff --git a/modules/samples/common.xml b/modules/samples/common.xml
index 7693f6d9..597dc07b 100644
--- a/modules/samples/common.xml
+++ b/modules/samples/common.xml
@@ -6,6 +6,7 @@
     <property name="target.dropins.dir" value="../../repository/components/dropins"/>
     <property name="target.webapp.dir" value="../../repository/deployment/server/webapps"/>
     <property name="target.sketch.dir" value="../../repository/resources/sketches"/>
+    <property name="target.sample.device.dir" value="../../repository/deployment/server/jaggeryapps/publisher/samples/assets/devices"/>
     <property name="target.page.dir" value="../../repository/deployment/server/jaggeryapps/iotserver/pages/devices"/>
     <property name="target.unit.dir" value="../../repository/deployment/server/jaggeryapps/iotserver/units"/>
     <property name="target.version" value="1.0.0-SNAPSHOT"/>
diff --git a/modules/samples/raspberrypi/artifact/device.json b/modules/samples/raspberrypi/artifact/device.json
new file mode 100644
index 00000000..fbe22d8c
--- /dev/null
+++ b/modules/samples/raspberrypi/artifact/device.json
@@ -0,0 +1,18 @@
+{
+  "name": "Raspberry Pi",
+  "tags": "WSO2, IoT, RaspberryPi, RaspberryPi-B Plus",
+  "rate": 3,
+  "attributes": {
+    "overview_status": "PUBLISHED",
+    "overview_provider": "admin",
+    "overview_name": "Raspberry Pi",
+    "overview_version": "1.0.0",
+    "overview_board": "RaspberryPi",
+    "overview_url": "https://204.232.188.214:9443/iotserver/devices/raspberrypi",
+    "overview_model": "RaspberryPi B+",
+    "overview_defaultOs": "Cross-Platform",
+    "overview_description": "This is a bare-board Raspberry Pi Device-Type. The board used here is RPi B+.",
+    "images_thumbnail": "/raspberrypi/raspberryPi_thumbnail.png",
+    "images_banner": "/raspberrypi/raspberryPi_banner.png"
+  }
+}
\ No newline at end of file
diff --git a/modules/samples/raspberrypi/artifact/raspberryPi_banner.png b/modules/samples/raspberrypi/artifact/raspberryPi_banner.png
new file mode 100644
index 00000000..d7a12a21
Binary files /dev/null and b/modules/samples/raspberrypi/artifact/raspberryPi_banner.png differ
diff --git a/modules/samples/raspberrypi/artifact/raspberryPi_thumbnail.png b/modules/samples/raspberrypi/artifact/raspberryPi_thumbnail.png
new file mode 100644
index 00000000..845ddbf5
Binary files /dev/null and b/modules/samples/raspberrypi/artifact/raspberryPi_thumbnail.png differ
diff --git a/modules/samples/raspberrypi/build.xml b/modules/samples/raspberrypi/build.xml
index 93d38ae3..91e608e3 100644
--- a/modules/samples/raspberrypi/build.xml
+++ b/modules/samples/raspberrypi/build.xml
@@ -65,6 +65,11 @@
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
+        <mkdir dir="${target.sample.device.dir}/${sample_type}"/>
+        <copy toDir="${target.sample.device.dir}/${sample_type}">
+            <fileset dir="artifact/"/>
+        </copy>
+
         <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
         <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
         <copy file="page/${sample_type}.hbs" toDir="${target.page.dir}" overwrite="yes"/>