diff --git a/components/device-types/pom.xml b/components/device-types/pom.xml
index 55054c211..e9fb5774b 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.18</version>
+        <version>6.0.19-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 44c1f056c..01133dafa 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.18</version>
+		<version>6.0.19-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 0e468cd54..c1a58b3a8 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.18</version>
+		<version>6.0.19-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 7b3a7d386..4bc922526 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.18</version>
+        <version>6.0.19-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 9825795c3..8914ceac1 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.18</version>
+		<version>6.0.19-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 e4984c663..db3829816 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.18</version>
+        <version>6.0.19-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 2991ff707..94c84cabd 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.18</version>
+        <version>6.0.19-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 c682c1040..62d4629ac 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.18</version>
+		<version>6.0.19-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 0fce9c9b1..807180532 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.18</version>
+        <version>6.0.19-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 d9da50517..a2fcc7e8c 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.18</version>
+        <version>6.0.19-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 af7ebfa8c..a7ffeb066 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.18</version>
+        <version>6.0.19-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 c71fd9fa4..246bc4ff0 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.18</version>
+        <version>6.0.19-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 27b17fe89..bb566aa25 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.18</version>
+        <version>6.0.19-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 d0e836a88..311f8117a 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.18</version>
+        <version>6.0.19-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 f10e1e180..d2b6995a0 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.18</version>
+        <version>6.0.19-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 c86108937..641b08933 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.18</version>
+        <version>6.0.19-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 85fa1a972..db63043c5 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.18</version>
+        <version>6.0.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/emqx-extensions/pom.xml b/components/extensions/emqx-extensions/pom.xml
index 07403959e..3c2cc7cbb 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.18</version>
+        <version>6.0.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/pom.xml b/components/extensions/pom.xml
index a0cb86d3e..5b6223229 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.18</version>
+        <version>6.0.19-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 807798c1a..7509dfa9b 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.18</version>
+        <version>6.0.19-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 3f0996165..9fe5d9b23 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.18</version>
+        <version>6.0.19-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 59d6dc2ba..be6924969 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
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>siddhi-extensions</artifactId>
-        <version>6.0.18</version>
+        <version>6.0.19-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 cebe5fb0d..516aeec47 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
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>siddhi-extensions</artifactId>
-        <version>6.0.18</version>
+        <version>6.0.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/extensions/siddhi-extensions/pom.xml b/components/extensions/siddhi-extensions/pom.xml
index 643871c45..2fdbe55ea 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.18</version>
+        <version>6.0.19-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 86f8beab0..960d34562 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.18</version>
+        <version>6.0.19-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 d0b39eb4c..ecd006ee9 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.18</version>
+        <version>6.0.19-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 d5f22d68a..7888c2561 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.18</version>
+        <version>6.0.19-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 a55f02dfc..80f4a7454 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.18</version>
+        <version>6.0.19-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 b14b33b11..9459b8e79 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.18</version>
+        <version>6.0.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml
index af613786c..7d2699b07 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.18</version>
+        <version>6.0.19-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 1c71126c3..4ac338abf 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.18</version>
+        <version>6.0.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/analytics-feature/pom.xml b/features/analytics-feature/pom.xml
index 5226e194f..54c706cca 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.18</version>
+        <version>6.0.19-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/features/device-types-feature/pom.xml b/features/device-types-feature/pom.xml
index 69c636ce7..53e4c061b 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.18</version>
+        <version>6.0.19-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 4c6c157fc..eb540f4d8 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.18</version>
+		<version>6.0.19-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 e54946a91..d5c33de05 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.18</version>
+        <version>6.0.19-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 673bca249..1ec9cdaa0 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.18</version>
+        <version>6.0.19-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 4998c0efd..15ab62e73 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
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>extensions-feature</artifactId>
-        <version>6.0.18</version>
+        <version>6.0.19-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 d9ce71bff..90f268ad6 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
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>extensions-feature</artifactId>
-        <version>6.0.18</version>
+        <version>6.0.19-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 3d6eb23c0..7e27fb654 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
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
 		<artifactId>extensions-feature</artifactId>
-		<version>6.0.18</version>
+		<version>6.0.19-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 55972e7f9..aa4a6b2a9 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.18</version>
+        <version>6.0.19-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 d2939a6f4..37dca9ca9 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.18</version>
+        <version>6.0.19-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 694cbda00..b24abfeeb 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.18</version>
+        <version>6.0.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/mobile-plugins-feature/pom.xml b/features/mobile-plugins-feature/pom.xml
index 8b53d2e09..dea68784b 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.18</version>
+        <version>6.0.19-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index a1709e559..037d1a757 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.18</version>
+    <version>6.0.19-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Plugins Parent</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - Device Management Plugins Parent</description>
@@ -1170,7 +1170,7 @@
         <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.18</io.entgra.device.mgt.plugins.version>
+        <io.entgra.device.mgt.plugins.version>6.0.19-SNAPSHOT</io.entgra.device.mgt.plugins.version>
 
         <!-- Android Agent Artifact Version-->
         <android.agent.version>4.0.0</android.agent.version>
@@ -1361,7 +1361,7 @@
         <url>https://repository.entgra.net/community/device-mgt-plugins.git</url>
         <developerConnection>scm:git:https://repository.entgra.net/community/device-mgt-plugins.git</developerConnection>
         <connection>scm:git:https://repository.entgra.net/community/device-mgt-plugins.git</connection>
-        <tag>v6.0.18</tag>
+        <tag>v6.0.14</tag>
     </scm>