diff --git a/components/device-types/pom.xml b/components/device-types/pom.xml
index 86fc6f094..abe536bb2 100644
--- a/components/device-types/pom.xml
+++ b/components/device-types/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml
index bfff3709b..a0386fa75 100644
--- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml
+++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
-		<version>6.0.29-SNAPSHOT</version>
+		<version>6.0.30-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml
index 72ab88c71..aaea257ca 100644
--- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml
+++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
-		<version>6.0.29-SNAPSHOT</version>
+		<version>6.0.30-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/components/device-types/virtual-fire-alarm-plugin/pom.xml b/components/device-types/virtual-fire-alarm-plugin/pom.xml
index f739221bf..1ad5c5be6 100644
--- a/components/device-types/virtual-fire-alarm-plugin/pom.xml
+++ b/components/device-types/virtual-fire-alarm-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>device-types</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml
index d34aaee39..9155cdeff 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-		<version>6.0.29-SNAPSHOT</version>
+		<version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml
index 137f643da..f587abf61 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml
index b4b3b3ce2..c10de4869 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml
index 28cfeec97..82e5077d9 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
 		<artifactId>cdmf-transport-adapters</artifactId>
-		<version>6.0.29-SNAPSHOT</version>
+		<version>6.0.30-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml
index f50f82234..efd46c39f 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml
index 1e0396696..c9bfc0a22 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml
index 53ae2f8cd..7e8ac2f85 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml
index a1c22428e..7b1630dff 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml
index 0a28f7d42..7d8b305cf 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml
index 46c31280a..909dd2aa8 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/cdmf-transport-adapters/pom.xml b/components/extensions/cdmf-transport-adapters/pom.xml
index 2e129694a..f671fc64b 100644
--- a/components/extensions/cdmf-transport-adapters/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml
index 4b3f007c0..ced4dd84c 100644
--- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml
+++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>emqx-extensions</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml
index dd65f72f6..7e806a198 100644
--- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml
+++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>emqx-extensions</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/emqx-extensions/pom.xml b/components/extensions/emqx-extensions/pom.xml
index db014ea13..82d816301 100644
--- a/components/extensions/emqx-extensions/pom.xml
+++ b/components/extensions/emqx-extensions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/pom.xml b/components/extensions/pom.xml
index bc9759dd5..dd8997780 100644
--- a/components/extensions/pom.xml
+++ b/components/extensions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml
index f95dafdcf..47c69651a 100644
--- a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml
+++ b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
 		<artifactId>pull-notification-listeners</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/components/extensions/pull-notification-listeners/pom.xml b/components/extensions/pull-notification-listeners/pom.xml
index cae657148..b124fdd9c 100644
--- a/components/extensions/pull-notification-listeners/pom.xml
+++ b/components/extensions/pull-notification-listeners/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml
index 191c324b2..57c3dcd12 100644
--- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml
+++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>siddhi-extensions</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml
index c3c5a7c70..d2c84b4a5 100644
--- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml
+++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>siddhi-extensions</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/siddhi-extensions/pom.xml b/components/extensions/siddhi-extensions/pom.xml
index d7d00db7d..f24a1e2ea 100644
--- a/components/extensions/siddhi-extensions/pom.xml
+++ b/components/extensions/siddhi-extensions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml
index 2460e29d3..ccddd6d86 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml
index 2caa97d22..dc7324233 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml
index bf044e31b..0eac699fe 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
index a12bbb446..97e32584d 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml
index 90af6da77..a8793d450 100644
--- a/components/mobile-plugins/android-plugin/pom.xml
+++ b/components/mobile-plugins/android-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>mobile-plugins</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml
index ba624fb2b..03e4b7705 100644
--- a/components/mobile-plugins/pom.xml
+++ b/components/mobile-plugins/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml
index 736da3e44..6b4cbfc99 100644
--- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml
+++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>analytics-feature</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/analytics-feature/pom.xml b/features/analytics-feature/pom.xml
index 17f48de2b..6dfd694f3 100644
--- a/features/analytics-feature/pom.xml
+++ b/features/analytics-feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/features/device-types-feature/pom.xml b/features/device-types-feature/pom.xml
index 6f4f64699..d6f9974fd 100644
--- a/features/device-types-feature/pom.xml
+++ b/features/device-types-feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml
index e4e6a1b02..cbc68ecde 100644
--- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml
+++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
 		<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
-		<version>6.0.29-SNAPSHOT</version>
+		<version>6.0.30-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml
index 1dbd12587..1b081c55c 100644
--- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml
+++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>device-types-feature</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml
index 6e05321ff..455eb1c38 100644
--- a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml
+++ b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>extensions-feature</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml
index 31d87b045..7c762992c 100644
--- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml
+++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>extensions-feature</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml
index 382555cf3..46192dc3e 100644
--- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml
+++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>extensions-feature</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml
index 57d9c3bec..9ed5909e7 100644
--- a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml
+++ b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
 		<artifactId>extensions-feature</artifactId>
-		<version>6.0.29-SNAPSHOT</version>
+		<version>6.0.30-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/features/extensions-feature/pom.xml b/features/extensions-feature/pom.xml
index c97b35de3..2c1fb9248 100644
--- a/features/extensions-feature/pom.xml
+++ b/features/extensions-feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml
index 7d5e1b3e9..149425864 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>android-plugin-feature</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/mobile-plugins-feature/android-plugin-feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/pom.xml
index c847a7b38..84bbee7e2 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/pom.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>mobile-plugins-feature</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/mobile-plugins-feature/pom.xml b/features/mobile-plugins-feature/pom.xml
index 285c7618e..954938abf 100644
--- a/features/mobile-plugins-feature/pom.xml
+++ b/features/mobile-plugins-feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>6.0.29-SNAPSHOT</version>
+        <version>6.0.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 2a6e20442..b1dd48f1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>io.entgra.device.mgt.plugins</groupId>
     <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
     <packaging>pom</packaging>
-    <version>6.0.29-SNAPSHOT</version>
+    <version>6.0.30-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Plugins Parent</name>
     <url>http://entgra.io</url>
     <description>WSO2 Carbon - Device Management Plugins Parent</description>
@@ -964,11 +964,11 @@
     <properties>
 
         <!-- Carbon Device Management -->
-        <io.entgra.device.mgt.core.version>5.0.40-SNAPSHOT</io.entgra.device.mgt.core.version>
+        <io.entgra.device.mgt.core.version>5.0.41-SNAPSHOT</io.entgra.device.mgt.core.version>
         <io.entgra.device.mgt.core.version.range>[5.0.0, 6.0.0)</io.entgra.device.mgt.core.version.range>
 
         <!-- Carbon Device Management Plugins -->
-        <io.entgra.device.mgt.plugins.version>6.0.29-SNAPSHOT</io.entgra.device.mgt.plugins.version>
+        <io.entgra.device.mgt.plugins.version>6.0.30-SNAPSHOT</io.entgra.device.mgt.plugins.version>
 
         <!-- Android Agent Artifact Version-->
         <android.agent.version>4.0.0</android.agent.version>