diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/datasources/cdm-datasources.xml b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/datasources/cdm-datasources.xml
index 78db49688e9..4494b4fcd64 100755
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/datasources/cdm-datasources.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/datasources/cdm-datasources.xml
@@ -61,5 +61,25 @@
                 </configuration>
             </definition>
         </datasource>
+        <datasource>
+            <name>EVENT_DB</name>
+            <description>The datasource used for event storing</description>
+            <jndiConfig>
+                <name>jdbc/EVENT_DB</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:./repository/database/EVENT_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;LOCK_TIMEOUT=60000</url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                </configuration>
+            </definition>
+        </datasource>
     </datasources>
 </datasources-configuration>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/cdm-datasources.xml.j2 b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/cdm-datasources.xml.j2
index e9105a8d3e4..81e6ed97147 100755
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/cdm-datasources.xml.j2
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/cdm-datasources.xml.j2
@@ -83,5 +83,36 @@
                 </configuration>
             </definition>
         </datasource>
+        <datasource>
+            <name>EVENT_DB</name>
+            <description>The datasource used for event storing</description>
+            <jndiConfig>
+                <name>jdbc/EVENT_DB</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                {% if database.device_mgt_event_db is defined %}
+                    <url>{{database.device_mgt_event_db.url}}</url>
+                    <username>{{database.device_mgt_event_db.username}}</username>
+                    <password>{{database.device_mgt_event_db.password}}</password>
+                    <driverClassName>{{database.device_mgt_event_db.driver}}</driverClassName>
+                    <validationQuery>{{database.device_mgt_event_db.validationQuery}}</validationQuery>
+                    {% for property_name,property_value in database.device_mgt_event_db.pool_options.items() %}
+                    <{{property_name}}>{{property_value}}</{{property_name}}>
+                    {% endfor %}
+                 {% else %}
+                    <url>jdbc:h2:./repository/database/EVENT_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;LOCK_TIMEOUT=60000</url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                 {% endif %}
+                </configuration>
+            </definition>
+        </datasource>
     </datasources>
 </datasources-configuration>