Starting snapshot 1.8.5-SNAPSHOT
diff --git a/apps/acl/pom.xml b/apps/acl/pom.xml
index 7141da5..e8dbdce 100644
--- a/apps/acl/pom.xml
+++ b/apps/acl/pom.xml
@@ -26,11 +26,11 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-acl</artifactId>
-    <version>1.8.5-rc2</version>
+    <version>1.8.5-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <description>ONOS ACL application</description>
diff --git a/apps/actn-mdsc/actn-mdscapp/pom.xml b/apps/actn-mdsc/actn-mdscapp/pom.xml
index 5d288be..5a8b56b 100644
--- a/apps/actn-mdsc/actn-mdscapp/pom.xml
+++ b/apps/actn-mdsc/actn-mdscapp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-actn-mdsc</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-actn-mdscapp</artifactId>
diff --git a/apps/actn-mdsc/pom.xml b/apps/actn-mdsc/pom.xml
index 87befcb..67c3608 100644
--- a/apps/actn-mdsc/pom.xml
+++ b/apps/actn-mdsc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-actn-mdsc</artifactId>
diff --git a/apps/actn-mdsc/tetunnel-ctl/pom.xml b/apps/actn-mdsc/tetunnel-ctl/pom.xml
index d44cec9..e21ac4b 100644
--- a/apps/actn-mdsc/tetunnel-ctl/pom.xml
+++ b/apps/actn-mdsc/tetunnel-ctl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-actn-mdsc</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-actn-mdsc-tetunnel-ctl</artifactId>
diff --git a/apps/actn-mdsc/tetunnel-pce/pom.xml b/apps/actn-mdsc/tetunnel-pce/pom.xml
index 871a1c6..e7039e8 100755
--- a/apps/actn-mdsc/tetunnel-pce/pom.xml
+++ b/apps/actn-mdsc/tetunnel-pce/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-actn-mdsc</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-tetunnel-api</artifactId>
-            <version>1.8.5-rc2</version>
+            <version>1.8.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-tetunnel-api</artifactId>
-            <version>1.8.5-rc2</version>
+            <version>1.8.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/apps/bgprouter/pom.xml b/apps/bgprouter/pom.xml
index 34988bc..831b8bf 100644
--- a/apps/bgprouter/pom.xml
+++ b/apps/bgprouter/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>onos-app-bgprouter</artifactId>
diff --git a/apps/bmv2-demo/common/pom.xml b/apps/bmv2-demo/common/pom.xml
index b8dae39..55fe5f4 100644
--- a/apps/bmv2-demo/common/pom.xml
+++ b/apps/bmv2-demo/common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-app-bmv2-demo</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo-common</artifactId>
diff --git a/apps/bmv2-demo/ecmp/pom.xml b/apps/bmv2-demo/ecmp/pom.xml
index 8cf0964..8ed38d5 100644
--- a/apps/bmv2-demo/ecmp/pom.xml
+++ b/apps/bmv2-demo/ecmp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-app-bmv2-demo</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo-ecmp</artifactId>
diff --git a/apps/bmv2-demo/pom.xml b/apps/bmv2-demo/pom.xml
index eec77a4..ae3c61f 100644
--- a/apps/bmv2-demo/pom.xml
+++ b/apps/bmv2-demo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo</artifactId>
diff --git a/apps/bmv2-demo/wcmp/pom.xml b/apps/bmv2-demo/wcmp/pom.xml
index b2f9b32..58722be 100644
--- a/apps/bmv2-demo/wcmp/pom.xml
+++ b/apps/bmv2-demo/wcmp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-app-bmv2-demo</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo-wcmp</artifactId>
diff --git a/apps/cip/pom.xml b/apps/cip/pom.xml
index 48f0e14..3ff5f06 100644
--- a/apps/cip/pom.xml
+++ b/apps/cip/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-cip</artifactId>
diff --git a/apps/cpman/api/pom.xml b/apps/cpman/api/pom.xml
index c475cbb..cdc97c6 100644
--- a/apps/cpman/api/pom.xml
+++ b/apps/cpman/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-cpman</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-cpman-api</artifactId>
diff --git a/apps/cpman/app/pom.xml b/apps/cpman/app/pom.xml
index ca9f20c..b48914f 100644
--- a/apps/cpman/app/pom.xml
+++ b/apps/cpman/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-cpman</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-cpman</artifactId>
diff --git a/apps/cpman/pom.xml b/apps/cpman/pom.xml
index 19c85b9..6d11904 100644
--- a/apps/cpman/pom.xml
+++ b/apps/cpman/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-cpman</artifactId>
diff --git a/apps/dhcp/api/pom.xml b/apps/dhcp/api/pom.xml
index 30000c9..7050c07 100644
--- a/apps/dhcp/api/pom.xml
+++ b/apps/dhcp/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-dhcp</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-dhcp-api</artifactId>
diff --git a/apps/dhcp/app/pom.xml b/apps/dhcp/app/pom.xml
index 064ee66..931af94 100644
--- a/apps/dhcp/app/pom.xml
+++ b/apps/dhcp/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-dhcp</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-dhcp</artifactId>
diff --git a/apps/dhcp/pom.xml b/apps/dhcp/pom.xml
index 0d3ce46..1b898783 100644
--- a/apps/dhcp/pom.xml
+++ b/apps/dhcp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-dhcp</artifactId>
diff --git a/apps/dhcprelay/pom.xml b/apps/dhcprelay/pom.xml
index 7fa4a83..27f03f7 100644
--- a/apps/dhcprelay/pom.xml
+++ b/apps/dhcprelay/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/drivermatrix/pom.xml b/apps/drivermatrix/pom.xml
index c5dd538..d82b63e 100644
--- a/apps/drivermatrix/pom.xml
+++ b/apps/drivermatrix/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-drivermatrix</artifactId>
diff --git a/apps/events/pom.xml b/apps/events/pom.xml
index a8ddbba..0aec68b 100644
--- a/apps/events/pom.xml
+++ b/apps/events/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-events</artifactId>
diff --git a/apps/faultmanagement/app/pom.xml b/apps/faultmanagement/app/pom.xml
index f02fb06..57bc1d4 100644
--- a/apps/faultmanagement/app/pom.xml
+++ b/apps/faultmanagement/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-fm-onosfw</artifactId>
diff --git a/apps/faultmanagement/fmcli/pom.xml b/apps/faultmanagement/fmcli/pom.xml
index d045bde..14c43cd 100644
--- a/apps/faultmanagement/fmcli/pom.xml
+++ b/apps/faultmanagement/fmcli/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-fm-cli</artifactId>
diff --git a/apps/faultmanagement/fmgui/pom.xml b/apps/faultmanagement/fmgui/pom.xml
index 840f20a..d1f4538 100644
--- a/apps/faultmanagement/fmgui/pom.xml
+++ b/apps/faultmanagement/fmgui/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-fm-gui</artifactId>
diff --git a/apps/faultmanagement/fmmgr/pom.xml b/apps/faultmanagement/fmmgr/pom.xml
index 2f49964..17171cf 100644
--- a/apps/faultmanagement/fmmgr/pom.xml
+++ b/apps/faultmanagement/fmmgr/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-fm-mgr</artifactId>
diff --git a/apps/faultmanagement/fmweb/pom.xml b/apps/faultmanagement/fmweb/pom.xml
index 4ccd88b..fe1a544 100644
--- a/apps/faultmanagement/fmweb/pom.xml
+++ b/apps/faultmanagement/fmweb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
 
diff --git a/apps/faultmanagement/pom.xml b/apps/faultmanagement/pom.xml
index 309ca0f..1bdd280 100644
--- a/apps/faultmanagement/pom.xml
+++ b/apps/faultmanagement/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-fm</artifactId>
diff --git a/apps/flowanalyzer/pom.xml b/apps/flowanalyzer/pom.xml
index aeaddb6..ebec31e 100644
--- a/apps/flowanalyzer/pom.xml
+++ b/apps/flowanalyzer/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-flowanalyzer</artifactId>
diff --git a/apps/fwd/pom.xml b/apps/fwd/pom.xml
index 40f029c..58f14c4 100644
--- a/apps/fwd/pom.xml
+++ b/apps/fwd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-fwd</artifactId>
diff --git a/apps/gangliametrics/pom.xml b/apps/gangliametrics/pom.xml
index cd93b41..0d014b0 100644
--- a/apps/gangliametrics/pom.xml
+++ b/apps/gangliametrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-ganglia</artifactId>
diff --git a/apps/graphitemetrics/pom.xml b/apps/graphitemetrics/pom.xml
index d721525..eb72ad9 100644
--- a/apps/graphitemetrics/pom.xml
+++ b/apps/graphitemetrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-graphite</artifactId>
diff --git a/apps/influxdbmetrics/pom.xml b/apps/influxdbmetrics/pom.xml
index fdd2670..a09ea9a 100644
--- a/apps/influxdbmetrics/pom.xml
+++ b/apps/influxdbmetrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-influxdb</artifactId>
diff --git a/apps/iptopology-api/pom.xml b/apps/iptopology-api/pom.xml
index a42bce2..0732cd0 100644
--- a/apps/iptopology-api/pom.xml
+++ b/apps/iptopology-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <artifactId>onos-app-iptopology-api</artifactId>
     <packaging>bundle</packaging>
diff --git a/apps/kafka-integration/api/pom.xml b/apps/kafka-integration/api/pom.xml
index aaa1806..14bce3a 100644
--- a/apps/kafka-integration/api/pom.xml
+++ b/apps/kafka-integration/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-kafka</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-kafka-api</artifactId>
diff --git a/apps/kafka-integration/app/pom.xml b/apps/kafka-integration/app/pom.xml
index 2886a15..2f9a35c 100644
--- a/apps/kafka-integration/app/pom.xml
+++ b/apps/kafka-integration/app/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-kafka</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/kafka-integration/core/pom.xml b/apps/kafka-integration/core/pom.xml
index af9c527..d3b65d2 100644
--- a/apps/kafka-integration/core/pom.xml
+++ b/apps/kafka-integration/core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-kafka</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/kafka-integration/pom.xml b/apps/kafka-integration/pom.xml
index 1691160..f739dc7 100644
--- a/apps/kafka-integration/pom.xml
+++ b/apps/kafka-integration/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/kafka-integration/web/pom.xml b/apps/kafka-integration/web/pom.xml
index 3609d88..35ffb65 100644
--- a/apps/kafka-integration/web/pom.xml
+++ b/apps/kafka-integration/web/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-kafka</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/learning-switch/pom.xml b/apps/learning-switch/pom.xml
index 3ada29b..1f4b6fa 100644
--- a/apps/learning-switch/pom.xml
+++ b/apps/learning-switch/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/metrics/pom.xml b/apps/metrics/pom.xml
index 33981a8..1149041 100644
--- a/apps/metrics/pom.xml
+++ b/apps/metrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-metrics</artifactId>
diff --git a/apps/mfwd/pom.xml b/apps/mfwd/pom.xml
index 3400bde..2c09883 100644
--- a/apps/mfwd/pom.xml
+++ b/apps/mfwd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-mfwd</artifactId>
diff --git a/apps/mlb/pom.xml b/apps/mlb/pom.xml
index 39323d3..67ddd22 100644
--- a/apps/mlb/pom.xml
+++ b/apps/mlb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-mlb</artifactId>
diff --git a/apps/mobility/pom.xml b/apps/mobility/pom.xml
index cfc52c9..e44ebe8 100644
--- a/apps/mobility/pom.xml
+++ b/apps/mobility/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-mobility</artifactId>
diff --git a/apps/newoptical/pom.xml b/apps/newoptical/pom.xml
index 8373c06..80adfa3 100644
--- a/apps/newoptical/pom.xml
+++ b/apps/newoptical/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-newoptical</artifactId>
diff --git a/apps/openstackinterface/api/pom.xml b/apps/openstackinterface/api/pom.xml
index 4bb11b5..08f3415 100644
--- a/apps/openstackinterface/api/pom.xml
+++ b/apps/openstackinterface/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstackinterface</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstackinterface-api</artifactId>
diff --git a/apps/openstackinterface/app/pom.xml b/apps/openstackinterface/app/pom.xml
index 55e4167..86dd22b 100644
--- a/apps/openstackinterface/app/pom.xml
+++ b/apps/openstackinterface/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstackinterface</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstackinterface-app</artifactId>
diff --git a/apps/openstackinterface/pom.xml b/apps/openstackinterface/pom.xml
index ceab7da..821016a 100644
--- a/apps/openstackinterface/pom.xml
+++ b/apps/openstackinterface/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstackinterface</artifactId>
diff --git a/apps/openstacknetworking/api/pom.xml b/apps/openstacknetworking/api/pom.xml
index d64ab36..6ad76bc 100644
--- a/apps/openstacknetworking/api/pom.xml
+++ b/apps/openstacknetworking/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking-api</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-openstackinterface-api</artifactId>
-            <version>1.8.5-rc2</version>
+            <version>1.8.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/apps/openstacknetworking/cli/pom.xml b/apps/openstacknetworking/cli/pom.xml
index e293cfb..7c06c70 100644
--- a/apps/openstacknetworking/cli/pom.xml
+++ b/apps/openstacknetworking/cli/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking-cli</artifactId>
diff --git a/apps/openstacknetworking/pom.xml b/apps/openstacknetworking/pom.xml
index 068bf9d..fc6ed22 100644
--- a/apps/openstacknetworking/pom.xml
+++ b/apps/openstacknetworking/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking</artifactId>
diff --git a/apps/openstacknetworking/routing/pom.xml b/apps/openstacknetworking/routing/pom.xml
index 12b149a..dfc4b32 100644
--- a/apps/openstacknetworking/routing/pom.xml
+++ b/apps/openstacknetworking/routing/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstackrouting</artifactId>
diff --git a/apps/openstacknetworking/switching/pom.xml b/apps/openstacknetworking/switching/pom.xml
index b9b79ce..5fb75bd 100644
--- a/apps/openstacknetworking/switching/pom.xml
+++ b/apps/openstacknetworking/switching/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstackswitching</artifactId>
diff --git a/apps/openstacknetworking/web/pom.xml b/apps/openstacknetworking/web/pom.xml
index 31c0355..a39468e 100644
--- a/apps/openstacknetworking/web/pom.xml
+++ b/apps/openstacknetworking/web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking-web</artifactId>
diff --git a/apps/openstacknode/pom.xml b/apps/openstacknode/pom.xml
index 7c18a40..37c35e3 100644
--- a/apps/openstacknode/pom.xml
+++ b/apps/openstacknode/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstacknode</artifactId>
diff --git a/apps/optical-model/pom.xml b/apps/optical-model/pom.xml
index ab871df..89e56ea 100644
--- a/apps/optical-model/pom.xml
+++ b/apps/optical-model/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/optical/pom.xml b/apps/optical/pom.xml
index c481c9b..a3bd1d4 100644
--- a/apps/optical/pom.xml
+++ b/apps/optical/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-optical</artifactId>
diff --git a/apps/patchpanel/pom.xml b/apps/patchpanel/pom.xml
index 37c7b8f..f4c9e1d 100644
--- a/apps/patchpanel/pom.xml
+++ b/apps/patchpanel/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/pathpainter/pom.xml b/apps/pathpainter/pom.xml
index 77c8b3e..28f9d34 100644
--- a/apps/pathpainter/pom.xml
+++ b/apps/pathpainter/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-pp</artifactId>
diff --git a/apps/pce/app/pom.xml b/apps/pce/app/pom.xml
index 27201be..ab000ea 100644
--- a/apps/pce/app/pom.xml
+++ b/apps/pce/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pce</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <artifactId>onos-app-pce</artifactId>
     <packaging>bundle</packaging>
diff --git a/apps/pce/pcerest/pom.xml b/apps/pce/pcerest/pom.xml
index f1dfa06..267ec02 100644
--- a/apps/pce/pcerest/pom.xml
+++ b/apps/pce/pcerest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pce</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/pce/pceweb/pom.xml b/apps/pce/pceweb/pom.xml
index 64c1953..a9a9d0b 100644
--- a/apps/pce/pceweb/pom.xml
+++ b/apps/pce/pceweb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pce</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-pceweb</artifactId>
diff --git a/apps/pce/pom.xml b/apps/pce/pom.xml
index 163efec..68bc75c 100644
--- a/apps/pce/pom.xml
+++ b/apps/pce/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/pcep-api/pom.xml b/apps/pcep-api/pom.xml
index 2326a1b..81b78e9 100644
--- a/apps/pcep-api/pom.xml
+++ b/apps/pcep-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <artifactId>onos-app-pcep-api</artifactId>
     <packaging>bundle</packaging>
diff --git a/apps/pim/pom.xml b/apps/pim/pom.xml
index d71304e..911710e 100644
--- a/apps/pim/pom.xml
+++ b/apps/pim/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-pim</artifactId>
diff --git a/apps/pom.xml b/apps/pom.xml
index f6534bf..3720f65 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-apps</artifactId>
diff --git a/apps/proxyarp/pom.xml b/apps/proxyarp/pom.xml
index e560948..60e73f9 100644
--- a/apps/proxyarp/pom.xml
+++ b/apps/proxyarp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-proxyarp</artifactId>
diff --git a/apps/rabbitmq/pom.xml b/apps/rabbitmq/pom.xml
index 4e1b26e..086f617 100644
--- a/apps/rabbitmq/pom.xml
+++ b/apps/rabbitmq/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>onos-app-rabbitmq</artifactId>
diff --git a/apps/reactive-routing/pom.xml b/apps/reactive-routing/pom.xml
index 8be7ee2..e3394e9 100644
--- a/apps/reactive-routing/pom.xml
+++ b/apps/reactive-routing/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-reactive-routing</artifactId>
diff --git a/apps/routing-api/pom.xml b/apps/routing-api/pom.xml
index 5f75d9d..cfca465 100644
--- a/apps/routing-api/pom.xml
+++ b/apps/routing-api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/routing/pom.xml b/apps/routing/pom.xml
index 5b2e32a..48a52ca 100644
--- a/apps/routing/pom.xml
+++ b/apps/routing/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/scalablegateway/pom.xml b/apps/scalablegateway/pom.xml
index 37714b2..2ed900e 100644
--- a/apps/scalablegateway/pom.xml
+++ b/apps/scalablegateway/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-scalablegateway</artifactId>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-cli</artifactId>
-            <version>1.8.5-rc2</version>
+            <version>1.8.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/apps/sdnip/pom.xml b/apps/sdnip/pom.xml
index 1a13bb5..b64ce47 100644
--- a/apps/sdnip/pom.xml
+++ b/apps/sdnip/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-sdnip</artifactId>
diff --git a/apps/segmentrouting/pom.xml b/apps/segmentrouting/pom.xml
index d13ba67..cf8d5dc 100644
--- a/apps/segmentrouting/pom.xml
+++ b/apps/segmentrouting/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-segmentrouting</artifactId>
diff --git a/apps/tenbi/pom.xml b/apps/tenbi/pom.xml
index 4d3e71f..408f882 100644
--- a/apps/tenbi/pom.xml
+++ b/apps/tenbi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/tenbi/topology/pom.xml b/apps/tenbi/topology/pom.xml
index 3590996..0217872 100644
--- a/apps/tenbi/topology/pom.xml
+++ b/apps/tenbi/topology/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-tenbi</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/tenbi/tunnel/pom.xml b/apps/tenbi/tunnel/pom.xml
index 00d87c8..c4de8c0 100755
--- a/apps/tenbi/tunnel/pom.xml
+++ b/apps/tenbi/tunnel/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-app-tenbi</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/tenbi/utils/pom.xml b/apps/tenbi/utils/pom.xml
index 55e30ff..b21949f 100644
--- a/apps/tenbi/utils/pom.xml
+++ b/apps/tenbi/utils/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-tenbi</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/tenbi/yangmodel/pom.xml b/apps/tenbi/yangmodel/pom.xml
index aab0e77..c10a5a1 100644
--- a/apps/tenbi/yangmodel/pom.xml
+++ b/apps/tenbi/yangmodel/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-tenbi</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/test/demo/pom.xml b/apps/test/demo/pom.xml
index b95d5cc..9fa14dd 100644
--- a/apps/test/demo/pom.xml
+++ b/apps/test/demo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-demo</artifactId>
diff --git a/apps/test/distributed-primitives/pom.xml b/apps/test/distributed-primitives/pom.xml
index f0c584b..11cb037 100644
--- a/apps/test/distributed-primitives/pom.xml
+++ b/apps/test/distributed-primitives/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-distributed-primitives</artifactId>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-core-dist</artifactId>
-            <version>1.8.5-rc2</version>
+            <version>1.8.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/apps/test/election/pom.xml b/apps/test/election/pom.xml
index 34eb07d..77fc7af 100644
--- a/apps/test/election/pom.xml
+++ b/apps/test/election/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-election</artifactId>
diff --git a/apps/test/flow-perf/pom.xml b/apps/test/flow-perf/pom.xml
index aaf4ecd..f660cbb 100644
--- a/apps/test/flow-perf/pom.xml
+++ b/apps/test/flow-perf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-flow-perf</artifactId>
diff --git a/apps/test/intent-perf/pom.xml b/apps/test/intent-perf/pom.xml
index 3493094..ac9ec86 100644
--- a/apps/test/intent-perf/pom.xml
+++ b/apps/test/intent-perf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-intent-perf</artifactId>
diff --git a/apps/test/loadtest/pom.xml b/apps/test/loadtest/pom.xml
index 96ff7da..7a8edb9 100644
--- a/apps/test/loadtest/pom.xml
+++ b/apps/test/loadtest/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-loadtest</artifactId>
diff --git a/apps/test/messaging-perf/pom.xml b/apps/test/messaging-perf/pom.xml
index 52f71e1..9890d1e 100644
--- a/apps/test/messaging-perf/pom.xml
+++ b/apps/test/messaging-perf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-messaging-perf</artifactId>
diff --git a/apps/test/netcfg-monitor/pom.xml b/apps/test/netcfg-monitor/pom.xml
index d0df762..3670edc 100644
--- a/apps/test/netcfg-monitor/pom.xml
+++ b/apps/test/netcfg-monitor/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-netcfg-monitor</artifactId>
diff --git a/apps/test/pom.xml b/apps/test/pom.xml
index 123d31f..e8109f3 100644
--- a/apps/test/pom.xml
+++ b/apps/test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-apps-test</artifactId>
diff --git a/apps/tetopology/api/pom.xml b/apps/tetopology/api/pom.xml
index 1f31a64..db25997 100644
--- a/apps/tetopology/api/pom.xml
+++ b/apps/tetopology/api/pom.xml
@@ -21,11 +21,11 @@
     <parent>
         <artifactId>onos-tetopology</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-tetopology-api</artifactId>
-    <version>1.8.5-rc2</version>
+    <version>1.8.5-SNAPSHOT</version>
     <packaging>bundle</packaging>
     
     <description>IETF TE topology management API</description>
diff --git a/apps/tetopology/app/pom.xml b/apps/tetopology/app/pom.xml
index cc10c8d..bc1ed7e 100644
--- a/apps/tetopology/app/pom.xml
+++ b/apps/tetopology/app/pom.xml
@@ -21,11 +21,11 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-tetopology</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-tetopology</artifactId>
-    <version>1.8.5-rc2</version>
+    <version>1.8.5-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <description>IETF TE topology application</description>
diff --git a/apps/tetopology/pom.xml b/apps/tetopology/pom.xml
index d739231..620e5b3 100644
--- a/apps/tetopology/pom.xml
+++ b/apps/tetopology/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-tetopology</artifactId>
diff --git a/apps/tetunnel/api/pom.xml b/apps/tetunnel/api/pom.xml
index b3dee89..c377625 100755
--- a/apps/tetunnel/api/pom.xml
+++ b/apps/tetunnel/api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-tetunnel</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-tetunnel-api</artifactId>
diff --git a/apps/tetunnel/app/pom.xml b/apps/tetunnel/app/pom.xml
index e21028c..577b01f 100644
--- a/apps/tetunnel/app/pom.xml
+++ b/apps/tetunnel/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-tetunnel</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-tetunnel</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-tetunnel-api</artifactId>
-            <version>1.8.5-rc2</version>
+            <version>1.8.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-core-serializers</artifactId>
-            <version>1.8.5-rc2</version>
+            <version>1.8.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/apps/tetunnel/pom.xml b/apps/tetunnel/pom.xml
index 33491d8..adce628 100644
--- a/apps/tetunnel/pom.xml
+++ b/apps/tetunnel/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-tetunnel</artifactId>
diff --git a/apps/virtualbng/pom.xml b/apps/virtualbng/pom.xml
index b9aa962..082e604 100644
--- a/apps/virtualbng/pom.xml
+++ b/apps/virtualbng/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-virtualbng</artifactId>
diff --git a/apps/vpls/pom.xml b/apps/vpls/pom.xml
index aed9171..bb80715 100644
--- a/apps/vpls/pom.xml
+++ b/apps/vpls/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-vpls</artifactId>
diff --git a/apps/vrouter/pom.xml b/apps/vrouter/pom.xml
index b05fca6..5f58144 100644
--- a/apps/vrouter/pom.xml
+++ b/apps/vrouter/pom.xml
@@ -21,12 +21,12 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos-app-vrouter</artifactId>
-    <version>1.8.5-rc2</version>
+    <version>1.8.5-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <description>Virtual router (vRouter) application</description>
diff --git a/apps/vtn/app/pom.xml b/apps/vtn/app/pom.xml
index 762209a..fe43045 100644
--- a/apps/vtn/app/pom.xml
+++ b/apps/vtn/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-vtn-onosfw</artifactId>
diff --git a/apps/vtn/pom.xml b/apps/vtn/pom.xml
index 702f0c5..64de568 100644
--- a/apps/vtn/pom.xml
+++ b/apps/vtn/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-vtn</artifactId>
diff --git a/apps/vtn/sfcmgr/pom.xml b/apps/vtn/sfcmgr/pom.xml
index 4b45d70..9f5b9c7 100644
--- a/apps/vtn/sfcmgr/pom.xml
+++ b/apps/vtn/sfcmgr/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.onosproject</groupId>
 		<artifactId>onos-app-vtn</artifactId>
-		<version>1.8.5-rc2</version>
+		<version>1.8.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>onos-app-sfc-mgr</artifactId>
diff --git a/apps/vtn/sfcweb/pom.xml b/apps/vtn/sfcweb/pom.xml
index 5b59896..f587369 100755
--- a/apps/vtn/sfcweb/pom.xml
+++ b/apps/vtn/sfcweb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-sfc-web</artifactId>
diff --git a/apps/vtn/vtnmgr/pom.xml b/apps/vtn/vtnmgr/pom.xml
index db93ce2..0012778 100644
--- a/apps/vtn/vtnmgr/pom.xml
+++ b/apps/vtn/vtnmgr/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-vtn-mgr</artifactId>
diff --git a/apps/vtn/vtnrsc/pom.xml b/apps/vtn/vtnrsc/pom.xml
index 9910a35..696f619 100644
--- a/apps/vtn/vtnrsc/pom.xml
+++ b/apps/vtn/vtnrsc/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
 
diff --git a/apps/vtn/vtnweb/pom.xml b/apps/vtn/vtnweb/pom.xml
index fd786ca..475a5e3 100644
--- a/apps/vtn/vtnweb/pom.xml
+++ b/apps/vtn/vtnweb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
 
diff --git a/apps/xosclient/pom.xml b/apps/xosclient/pom.xml
index a087c97..f84a14c 100644
--- a/apps/xosclient/pom.xml
+++ b/apps/xosclient/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-xos-client</artifactId>
diff --git a/apps/yms/api/pom.xml b/apps/yms/api/pom.xml
index dfaac91..03e37ca 100644
--- a/apps/yms/api/pom.xml
+++ b/apps/yms/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-yms</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-yms-api</artifactId>
diff --git a/apps/yms/app/pom.xml b/apps/yms/app/pom.xml
index 9a98da4..388664a 100644
--- a/apps/yms/app/pom.xml
+++ b/apps/yms/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-yms</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-yms</artifactId>
diff --git a/apps/yms/pom.xml b/apps/yms/pom.xml
index c03d9b6..2ad24a0 100644
--- a/apps/yms/pom.xml
+++ b/apps/yms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-yms</artifactId>
diff --git a/apps/yms/ut/pom.xml b/apps/yms/ut/pom.xml
index bf57b8a..c736b33 100644
--- a/apps/yms/ut/pom.xml
+++ b/apps/yms/ut/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-yms</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-rc2</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-yms-ut</artifactId>