diff --git a/apps/acl/pom.xml b/apps/acl/pom.xml
index e8dbdce..99051b8 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-acl</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</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 5a8b56b..52385a4 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-actn-mdscapp</artifactId>
diff --git a/apps/actn-mdsc/pom.xml b/apps/actn-mdsc/pom.xml
index 67c3608..9cb0eb4 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-SNAPSHOT</version>
+        <version>1.8.5</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 e21ac4b..65e02cc 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-SNAPSHOT</version>
+        <version>1.8.5</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 e7039e8..c1da0e9 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-SNAPSHOT</version>
+        <version>1.8.5</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-SNAPSHOT</version>
+            <version>1.8.5</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-tetunnel-api</artifactId>
-            <version>1.8.5-SNAPSHOT</version>
+            <version>1.8.5</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/apps/bgprouter/pom.xml b/apps/bgprouter/pom.xml
index 831b8bf..b61bcdd 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-SNAPSHOT</version>
+        <version>1.8.5</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 55fe5f4..c578332 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-SNAPSHOT</version>
+        <version>1.8.5</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 8ed38d5..90e0747 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo-ecmp</artifactId>
diff --git a/apps/bmv2-demo/pom.xml b/apps/bmv2-demo/pom.xml
index ae3c61f..c6b8b03 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-SNAPSHOT</version>
+        <version>1.8.5</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 58722be..d0228bf 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo-wcmp</artifactId>
diff --git a/apps/cip/pom.xml b/apps/cip/pom.xml
index 3ff5f06..62bb153 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-cip</artifactId>
diff --git a/apps/cpman/api/pom.xml b/apps/cpman/api/pom.xml
index cdc97c6..8f906e2 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-cpman-api</artifactId>
diff --git a/apps/cpman/app/pom.xml b/apps/cpman/app/pom.xml
index b48914f..4d3d051 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-cpman</artifactId>
diff --git a/apps/cpman/pom.xml b/apps/cpman/pom.xml
index 6d11904..1d37b78 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-cpman</artifactId>
diff --git a/apps/dhcp/api/pom.xml b/apps/dhcp/api/pom.xml
index 7050c07..f523c29 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-dhcp-api</artifactId>
diff --git a/apps/dhcp/app/pom.xml b/apps/dhcp/app/pom.xml
index 931af94..8ae4bf9 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-dhcp</artifactId>
diff --git a/apps/dhcp/pom.xml b/apps/dhcp/pom.xml
index 1b898783..edc3df2 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-dhcp</artifactId>
diff --git a/apps/dhcprelay/pom.xml b/apps/dhcprelay/pom.xml
index 27f03f7..bec557f 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-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/drivermatrix/pom.xml b/apps/drivermatrix/pom.xml
index d82b63e..8a98f7c 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-drivermatrix</artifactId>
diff --git a/apps/events/pom.xml b/apps/events/pom.xml
index 0aec68b..58f21d1 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-events</artifactId>
diff --git a/apps/faultmanagement/app/pom.xml b/apps/faultmanagement/app/pom.xml
index 57bc1d4..1c600c8 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-fm-onosfw</artifactId>
diff --git a/apps/faultmanagement/fmcli/pom.xml b/apps/faultmanagement/fmcli/pom.xml
index 14c43cd..63b86f7 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-fm-cli</artifactId>
diff --git a/apps/faultmanagement/fmgui/pom.xml b/apps/faultmanagement/fmgui/pom.xml
index d1f4538..8a5b355 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-fm-gui</artifactId>
diff --git a/apps/faultmanagement/fmmgr/pom.xml b/apps/faultmanagement/fmmgr/pom.xml
index 17171cf..28f4686 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-fm-mgr</artifactId>
diff --git a/apps/faultmanagement/fmweb/pom.xml b/apps/faultmanagement/fmweb/pom.xml
index fe1a544..6449f1a 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
 
diff --git a/apps/faultmanagement/pom.xml b/apps/faultmanagement/pom.xml
index 1bdd280..5f2a324 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-fm</artifactId>
diff --git a/apps/flowanalyzer/pom.xml b/apps/flowanalyzer/pom.xml
index ebec31e..eb1c348 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-flowanalyzer</artifactId>
diff --git a/apps/fwd/pom.xml b/apps/fwd/pom.xml
index 58f14c4..f513872 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-fwd</artifactId>
diff --git a/apps/gangliametrics/pom.xml b/apps/gangliametrics/pom.xml
index 0d014b0..b537b15 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-ganglia</artifactId>
diff --git a/apps/graphitemetrics/pom.xml b/apps/graphitemetrics/pom.xml
index eb72ad9..4d4d2ce 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-graphite</artifactId>
diff --git a/apps/influxdbmetrics/pom.xml b/apps/influxdbmetrics/pom.xml
index a09ea9a..9eb908f 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-influxdb</artifactId>
diff --git a/apps/iptopology-api/pom.xml b/apps/iptopology-api/pom.xml
index 0732cd0..98c7faf 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-SNAPSHOT</version>
+        <version>1.8.5</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 14bce3a..bafb031 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-SNAPSHOT</version>
+        <version>1.8.5</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 2f9a35c..498e98c 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/kafka-integration/core/pom.xml b/apps/kafka-integration/core/pom.xml
index d3b65d2..f08ac3f 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/kafka-integration/pom.xml b/apps/kafka-integration/pom.xml
index f739dc7..c74273e 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/kafka-integration/web/pom.xml b/apps/kafka-integration/web/pom.xml
index 35ffb65..5f5152c 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/learning-switch/pom.xml b/apps/learning-switch/pom.xml
index 1f4b6fa..89dfc5c 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-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/metrics/pom.xml b/apps/metrics/pom.xml
index 1149041..0b6a1d4 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-metrics</artifactId>
diff --git a/apps/mfwd/pom.xml b/apps/mfwd/pom.xml
index 2c09883..81927cd 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-mfwd</artifactId>
diff --git a/apps/mlb/pom.xml b/apps/mlb/pom.xml
index 67ddd22..7e06c56 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-mlb</artifactId>
diff --git a/apps/mobility/pom.xml b/apps/mobility/pom.xml
index e44ebe8..633fc7e 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-mobility</artifactId>
diff --git a/apps/newoptical/pom.xml b/apps/newoptical/pom.xml
index 80adfa3..621fd2c 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-newoptical</artifactId>
diff --git a/apps/openstackinterface/api/pom.xml b/apps/openstackinterface/api/pom.xml
index 08f3415..42555fe 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-openstackinterface-api</artifactId>
diff --git a/apps/openstackinterface/app/pom.xml b/apps/openstackinterface/app/pom.xml
index 86dd22b..1f8202a 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-openstackinterface-app</artifactId>
diff --git a/apps/openstackinterface/pom.xml b/apps/openstackinterface/pom.xml
index 821016a..212fb7e 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-openstackinterface</artifactId>
diff --git a/apps/openstacknetworking/api/pom.xml b/apps/openstacknetworking/api/pom.xml
index 6ad76bc..22034aa 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-SNAPSHOT</version>
+        <version>1.8.5</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-SNAPSHOT</version>
+            <version>1.8.5</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/apps/openstacknetworking/cli/pom.xml b/apps/openstacknetworking/cli/pom.xml
index 7c06c70..8090a2a 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking-cli</artifactId>
diff --git a/apps/openstacknetworking/pom.xml b/apps/openstacknetworking/pom.xml
index fc6ed22..9f00e9c 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking</artifactId>
diff --git a/apps/openstacknetworking/routing/pom.xml b/apps/openstacknetworking/routing/pom.xml
index dfc4b32..dbe03d1 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-openstackrouting</artifactId>
diff --git a/apps/openstacknetworking/switching/pom.xml b/apps/openstacknetworking/switching/pom.xml
index 5fb75bd..6b8e7f0 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-openstackswitching</artifactId>
diff --git a/apps/openstacknetworking/web/pom.xml b/apps/openstacknetworking/web/pom.xml
index a39468e..d9d51b6 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking-web</artifactId>
diff --git a/apps/openstacknode/pom.xml b/apps/openstacknode/pom.xml
index 37c35e3..4362f7f 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-openstacknode</artifactId>
diff --git a/apps/optical-model/pom.xml b/apps/optical-model/pom.xml
index 89e56ea..52b6e07 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/optical/pom.xml b/apps/optical/pom.xml
index a3bd1d4..27ab6a4 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-optical</artifactId>
diff --git a/apps/patchpanel/pom.xml b/apps/patchpanel/pom.xml
index f4c9e1d..9d23877 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/pathpainter/pom.xml b/apps/pathpainter/pom.xml
index 28f9d34..a9d5f66 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-pp</artifactId>
diff --git a/apps/pce/app/pom.xml b/apps/pce/app/pom.xml
index ab000ea..730235a 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-SNAPSHOT</version>
+        <version>1.8.5</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 267ec02..a9c801f 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-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/pce/pceweb/pom.xml b/apps/pce/pceweb/pom.xml
index a9a9d0b..32eaf4d 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-pceweb</artifactId>
diff --git a/apps/pce/pom.xml b/apps/pce/pom.xml
index 68bc75c..d28a4af 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/pcep-api/pom.xml b/apps/pcep-api/pom.xml
index 81b78e9..a26e126 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <artifactId>onos-app-pcep-api</artifactId>
     <packaging>bundle</packaging>
diff --git a/apps/pim/pom.xml b/apps/pim/pom.xml
index 911710e..6c5ed68 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-pim</artifactId>
diff --git a/apps/pom.xml b/apps/pom.xml
index 3720f65..e0ba7de 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-apps</artifactId>
diff --git a/apps/proxyarp/pom.xml b/apps/proxyarp/pom.xml
index 60e73f9..867c4ca 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-proxyarp</artifactId>
diff --git a/apps/rabbitmq/pom.xml b/apps/rabbitmq/pom.xml
index 086f617..1cc1e74 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-SNAPSHOT</version>
+        <version>1.8.5</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 e3394e9..202aa0c 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-reactive-routing</artifactId>
diff --git a/apps/routing-api/pom.xml b/apps/routing-api/pom.xml
index cfca465..73abecb 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/routing/pom.xml b/apps/routing/pom.xml
index 48a52ca..3726c5f 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/scalablegateway/pom.xml b/apps/scalablegateway/pom.xml
index 2ed900e..7136045 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-scalablegateway</artifactId>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-cli</artifactId>
-            <version>1.8.5-SNAPSHOT</version>
+            <version>1.8.5</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/apps/sdnip/pom.xml b/apps/sdnip/pom.xml
index b64ce47..a8caf65 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-sdnip</artifactId>
diff --git a/apps/segmentrouting/pom.xml b/apps/segmentrouting/pom.xml
index cf8d5dc..504fef2 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-segmentrouting</artifactId>
diff --git a/apps/tenbi/pom.xml b/apps/tenbi/pom.xml
index 408f882..d97f053 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-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/tenbi/topology/pom.xml b/apps/tenbi/topology/pom.xml
index 0217872..ce55385 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-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/tenbi/tunnel/pom.xml b/apps/tenbi/tunnel/pom.xml
index c4de8c0..f01a11a 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/tenbi/utils/pom.xml b/apps/tenbi/utils/pom.xml
index b21949f..9f1cf71 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-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/tenbi/yangmodel/pom.xml b/apps/tenbi/yangmodel/pom.xml
index c10a5a1..8a60bbd 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-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/test/demo/pom.xml b/apps/test/demo/pom.xml
index 9fa14dd..bebc1e3 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-demo</artifactId>
diff --git a/apps/test/distributed-primitives/pom.xml b/apps/test/distributed-primitives/pom.xml
index 11cb037..0c1fa16 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-SNAPSHOT</version>
+        <version>1.8.5</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-SNAPSHOT</version>
+            <version>1.8.5</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/apps/test/election/pom.xml b/apps/test/election/pom.xml
index 77fc7af..2a85d81 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-election</artifactId>
diff --git a/apps/test/flow-perf/pom.xml b/apps/test/flow-perf/pom.xml
index f660cbb..467cb92 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-SNAPSHOT</version>
+        <version>1.8.5</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 ac9ec86..18c2669 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-intent-perf</artifactId>
diff --git a/apps/test/loadtest/pom.xml b/apps/test/loadtest/pom.xml
index 7a8edb9..ba88d6f 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-loadtest</artifactId>
diff --git a/apps/test/messaging-perf/pom.xml b/apps/test/messaging-perf/pom.xml
index 9890d1e..eebfe34 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-SNAPSHOT</version>
+        <version>1.8.5</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 3670edc..d15f881 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-netcfg-monitor</artifactId>
diff --git a/apps/test/pom.xml b/apps/test/pom.xml
index ec16cea..59ad5ca 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-apps-test</artifactId>
diff --git a/apps/test/transaction-perf/pom.xml b/apps/test/transaction-perf/pom.xml
index c7bc4c7..e2e314a 100644
--- a/apps/test/transaction-perf/pom.xml
+++ b/apps/test/transaction-perf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.10.0-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-transaction-perf</artifactId>
diff --git a/apps/tetopology/api/pom.xml b/apps/tetopology/api/pom.xml
index db25997..5fa8aa7 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-tetopology-api</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</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 bc1ed7e..8881007 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-tetopology</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
     <packaging>bundle</packaging>
 
     <description>IETF TE topology application</description>
diff --git a/apps/tetopology/pom.xml b/apps/tetopology/pom.xml
index 620e5b3..f9d4b92 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-tetopology</artifactId>
diff --git a/apps/tetunnel/api/pom.xml b/apps/tetunnel/api/pom.xml
index c377625..7739b5a 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-tetunnel-api</artifactId>
diff --git a/apps/tetunnel/app/pom.xml b/apps/tetunnel/app/pom.xml
index 577b01f..0d7d348 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-SNAPSHOT</version>
+        <version>1.8.5</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-SNAPSHOT</version>
+            <version>1.8.5</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-core-serializers</artifactId>
-            <version>1.8.5-SNAPSHOT</version>
+            <version>1.8.5</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/apps/tetunnel/pom.xml b/apps/tetunnel/pom.xml
index adce628..31c9bd5 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-tetunnel</artifactId>
diff --git a/apps/virtualbng/pom.xml b/apps/virtualbng/pom.xml
index 082e604..933ad9f 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-virtualbng</artifactId>
diff --git a/apps/vpls/pom.xml b/apps/vpls/pom.xml
index bb80715..9cae38b 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-vpls</artifactId>
diff --git a/apps/vrouter/pom.xml b/apps/vrouter/pom.xml
index 5f58144..73dacef 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos-app-vrouter</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</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 fe43045..5452821 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-vtn-onosfw</artifactId>
diff --git a/apps/vtn/pom.xml b/apps/vtn/pom.xml
index 64de568..b966af8 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-vtn</artifactId>
diff --git a/apps/vtn/sfcmgr/pom.xml b/apps/vtn/sfcmgr/pom.xml
index 9f5b9c7..77092b5 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-SNAPSHOT</version>
+		<version>1.8.5</version>
 	</parent>
 
 	<artifactId>onos-app-sfc-mgr</artifactId>
diff --git a/apps/vtn/sfcweb/pom.xml b/apps/vtn/sfcweb/pom.xml
index f587369..fec7dc8 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-sfc-web</artifactId>
diff --git a/apps/vtn/vtnmgr/pom.xml b/apps/vtn/vtnmgr/pom.xml
index 0012778..8adb5d7 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-vtn-mgr</artifactId>
diff --git a/apps/vtn/vtnrsc/pom.xml b/apps/vtn/vtnrsc/pom.xml
index 696f619..0be1fc3 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
 
diff --git a/apps/vtn/vtnweb/pom.xml b/apps/vtn/vtnweb/pom.xml
index 475a5e3..2e80186 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
 
diff --git a/apps/xosclient/pom.xml b/apps/xosclient/pom.xml
index f84a14c..2a64823 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-xos-client</artifactId>
diff --git a/apps/yms/api/pom.xml b/apps/yms/api/pom.xml
index 03e37ca..09e1a30 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-yms-api</artifactId>
diff --git a/apps/yms/app/pom.xml b/apps/yms/app/pom.xml
index 388664a..40a180c 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-yms</artifactId>
diff --git a/apps/yms/pom.xml b/apps/yms/pom.xml
index 2ad24a0..78d70ce 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-yms</artifactId>
diff --git a/apps/yms/ut/pom.xml b/apps/yms/ut/pom.xml
index c736b33..87f2ae4 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-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-app-yms-ut</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 4ecfbab..d4a20be 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-cli</artifactId>
diff --git a/core/api/pom.xml b/core/api/pom.xml
index 8d05807..e806517 100644
--- a/core/api/pom.xml
+++ b/core/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-api</artifactId>
diff --git a/core/common/pom.xml b/core/common/pom.xml
index db28ddb..a4ea2d0 100644
--- a/core/common/pom.xml
+++ b/core/common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-core-common</artifactId>
diff --git a/core/net/pom.xml b/core/net/pom.xml
index ee00a0b..ece9051 100644
--- a/core/net/pom.xml
+++ b/core/net/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-core-net</artifactId>
diff --git a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
index 46d3c3e..f6ad273 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
@@ -64,7 +64,7 @@
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     private static final File VERSION_FILE = new File("../VERSION");
-    private static Version version = Version.version("1.8.5-SNAPSHOT");
+    private static Version version = Version.version("1.8.5");
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected ApplicationIdStore applicationIdStore;
diff --git a/core/pom.xml b/core/pom.xml
index 3fc448ce..82cd096 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-core</artifactId>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index be295e8..1dde8c7 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-core</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-security</artifactId>
diff --git a/core/store/dist/pom.xml b/core/store/dist/pom.xml
index 9b3aa15..7040549 100644
--- a/core/store/dist/pom.xml
+++ b/core/store/dist/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core-store</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-core-dist</artifactId>
diff --git a/core/store/persistence/pom.xml b/core/store/persistence/pom.xml
index 1db3d56..6aee164 100644
--- a/core/store/persistence/pom.xml
+++ b/core/store/persistence/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core-store</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-core-persistence</artifactId>
diff --git a/core/store/pom.xml b/core/store/pom.xml
index c61987a..0195f44 100644
--- a/core/store/pom.xml
+++ b/core/store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-core-store</artifactId>
diff --git a/core/store/primitives/pom.xml b/core/store/primitives/pom.xml
index aad8673..7392dcf 100644
--- a/core/store/primitives/pom.xml
+++ b/core/store/primitives/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core-store</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-core-primitives</artifactId>
diff --git a/core/store/serializers/pom.xml b/core/store/serializers/pom.xml
index 9cc1c4e..5c54602 100644
--- a/core/store/serializers/pom.xml
+++ b/core/store/serializers/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core-store</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-core-serializers</artifactId>
diff --git a/docs/external.xml b/docs/external.xml
index c10d0f3..27756a3 100644
--- a/docs/external.xml
+++ b/docs/external.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -53,7 +53,7 @@
                     </sourceFileExcludes>
                     <excludePackageNames>@external-excludes</excludePackageNames>
                     <docfilessubdirs>true</docfilessubdirs>
-                    <doctitle>ONOS Java API (1.8.5-SNAPSHOT)</doctitle>
+                    <doctitle>ONOS Java API (1.8.5)</doctitle>
                     <groups>
                         <group>
                             <title>Network Model &amp; Services</title>
diff --git a/docs/internal.xml b/docs/internal.xml
index dee6b63..fcae063 100644
--- a/docs/internal.xml
+++ b/docs/internal.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -49,7 +49,7 @@
                 <configuration>
                     <show>package</show>
                     <docfilessubdirs>true</docfilessubdirs>
-                    <doctitle>ONOS Java API (1.8.5-SNAPSHOT)</doctitle>
+                    <doctitle>ONOS Java API (1.8.5)</doctitle>
                     <excludePackageNames>@internal-excludes</excludePackageNames>
                     <sourceFileExcludes>
                         <sourceFileExclude>**/generated-sources/**</sourceFileExclude>
diff --git a/drivers/arista/pom.xml b/drivers/arista/pom.xml
index 009004d..89bb099 100755
--- a/drivers/arista/pom.xml
+++ b/drivers/arista/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/bmv2/pom.xml b/drivers/bmv2/pom.xml
index ec0a411..c95334c 100644
--- a/drivers/bmv2/pom.xml
+++ b/drivers/bmv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/bti/pom.xml b/drivers/bti/pom.xml
index 6bd835c..bda7d2a 100644
--- a/drivers/bti/pom.xml
+++ b/drivers/bti/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/ciena/pom.xml b/drivers/ciena/pom.xml
index 1ab4e55..a1792ef 100644
--- a/drivers/ciena/pom.xml
+++ b/drivers/ciena/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/cisco/pom.xml b/drivers/cisco/pom.xml
index 6826b31..0796f97 100644
--- a/drivers/cisco/pom.xml
+++ b/drivers/cisco/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/corsa/pom.xml b/drivers/corsa/pom.xml
index 5d69cd1..8ad391c 100644
--- a/drivers/corsa/pom.xml
+++ b/drivers/corsa/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/default/pom.xml b/drivers/default/pom.xml
index bc9a2d0..6f47a6a 100644
--- a/drivers/default/pom.xml
+++ b/drivers/default/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/fujitsu/pom.xml b/drivers/fujitsu/pom.xml
index 31cc52a..581529e 100644
--- a/drivers/fujitsu/pom.xml
+++ b/drivers/fujitsu/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/juniper/pom.xml b/drivers/juniper/pom.xml
index 832b38e..37a89d7 100644
--- a/drivers/juniper/pom.xml
+++ b/drivers/juniper/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/lumentum/pom.xml b/drivers/lumentum/pom.xml
index d936a74..bfc4c0d 100644
--- a/drivers/lumentum/pom.xml
+++ b/drivers/lumentum/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/netconf/pom.xml b/drivers/netconf/pom.xml
index 1b0e728..ffbe33c 100644
--- a/drivers/netconf/pom.xml
+++ b/drivers/netconf/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/optical/pom.xml b/drivers/optical/pom.xml
index e907008..e39acc5 100644
--- a/drivers/optical/pom.xml
+++ b/drivers/optical/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/ovsdb/pom.xml b/drivers/ovsdb/pom.xml
index 9441880..a9f284b 100644
--- a/drivers/ovsdb/pom.xml
+++ b/drivers/ovsdb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/pom.xml b/drivers/pom.xml
index 2c14978..1fd7439 100644
--- a/drivers/pom.xml
+++ b/drivers/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-drivers-general</artifactId>
diff --git a/drivers/utilities/pom.xml b/drivers/utilities/pom.xml
index 0810dae..3635873 100644
--- a/drivers/utilities/pom.xml
+++ b/drivers/utilities/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/features/pom.xml b/features/pom.xml
index 769d73d..235743a 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-features</artifactId>
diff --git a/incubator/api/pom.xml b/incubator/api/pom.xml
index efdc4f9..b7216da 100644
--- a/incubator/api/pom.xml
+++ b/incubator/api/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-incubator</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-incubator-api</artifactId>
diff --git a/incubator/core/pom.xml b/incubator/core/pom.xml
index 736c452..5d96d77 100644
--- a/incubator/core/pom.xml
+++ b/incubator/core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-incubator</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-incubator-core</artifactId>
diff --git a/incubator/grpc/pom.xml b/incubator/grpc/pom.xml
index b0eb5bb..caf2d29 100644
--- a/incubator/grpc/pom.xml
+++ b/incubator/grpc/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/incubator/net/pom.xml b/incubator/net/pom.xml
index 3753a5b..4e477d6 100644
--- a/incubator/net/pom.xml
+++ b/incubator/net/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-incubator</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-incubator-net</artifactId>
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 0225759..5d70b9e 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-incubator</artifactId>
diff --git a/incubator/protobuf-nb/pom.xml b/incubator/protobuf-nb/pom.xml
index 04f83a1..4657659 100644
--- a/incubator/protobuf-nb/pom.xml
+++ b/incubator/protobuf-nb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/incubator/protobuf/pom.xml b/incubator/protobuf/pom.xml
index 68cb43c..6ca293b 100644
--- a/incubator/protobuf/pom.xml
+++ b/incubator/protobuf/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-incubator-protobuf</artifactId>
diff --git a/incubator/rpc-grpc/pom.xml b/incubator/rpc-grpc/pom.xml
index 0ac4126..6cc0df7 100644
--- a/incubator/rpc-grpc/pom.xml
+++ b/incubator/rpc-grpc/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-incubator-rpc-grpc</artifactId>
diff --git a/incubator/rpc-nb/pom.xml b/incubator/rpc-nb/pom.xml
index eb2dd69..a571d65 100644
--- a/incubator/rpc-nb/pom.xml
+++ b/incubator/rpc-nb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/incubator/rpc/pom.xml b/incubator/rpc/pom.xml
index a9743b1..6bbc062 100644
--- a/incubator/rpc/pom.xml
+++ b/incubator/rpc/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-incubator-rpc</artifactId>
diff --git a/incubator/store/pom.xml b/incubator/store/pom.xml
index 252af5f..62efa54 100644
--- a/incubator/store/pom.xml
+++ b/incubator/store/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-incubator</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-incubator-store</artifactId>
diff --git a/lib/pom.xml b/lib/pom.xml
index 5408980..c3b51ff 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -33,7 +33,7 @@
     <groupId>org.onosproject</groupId>
     <artifactId>onos-dependencies</artifactId>
     <packaging>pom</packaging>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
 
     <name>${project.artifactId}</name>
     <description>Open Network Operating System shared dependencies</description>
diff --git a/onos.defs b/onos.defs
index 3b9b0c8..9f06692 100644
--- a/onos.defs
+++ b/onos.defs
@@ -1,6 +1,6 @@
 ONOS_ORIGIN = 'ON.Lab'
 ONOS_GROUP_ID = 'org.onosproject'
-ONOS_VERSION = '1.8.5-SNAPSHOT'
+ONOS_VERSION = '1.8.5'
 DEFAULT_APP_CATEGORY = 'Utility'
 ONOS_ARTIFACT_BASE = 'onos-'
 APP_PREFIX = ONOS_GROUP_ID + '.'
diff --git a/pom.xml b/pom.xml
index ee33a84..3c6277c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,14 +26,14 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-dependencies</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>lib/pom.xml</relativePath>
     </parent>
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos</artifactId>
     <packaging>pom</packaging>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
 
     <name>${project.artifactId}</name>
     <description>Open Network Operating System root project</description>
diff --git a/protocols/bgp/api/pom.xml b/protocols/bgp/api/pom.xml
index f6bfb42..2f7fe18 100755
--- a/protocols/bgp/api/pom.xml
+++ b/protocols/bgp/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-bgp-api</artifactId>
diff --git a/protocols/bgp/bgpio/pom.xml b/protocols/bgp/bgpio/pom.xml
index 9e808d5..e7cbc64 100755
--- a/protocols/bgp/bgpio/pom.xml
+++ b/protocols/bgp/bgpio/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-bgpio</artifactId>
diff --git a/protocols/bgp/ctl/pom.xml b/protocols/bgp/ctl/pom.xml
index d5b0276..c316c70 100644
--- a/protocols/bgp/ctl/pom.xml
+++ b/protocols/bgp/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-bgp-ctl</artifactId>
diff --git a/protocols/bgp/pom.xml b/protocols/bgp/pom.xml
index 2c0ba06..02a5afe 100755
--- a/protocols/bgp/pom.xml
+++ b/protocols/bgp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-bgp</artifactId>
diff --git a/protocols/bmv2/api/pom.xml b/protocols/bmv2/api/pom.xml
index 161b24c..e3fb18c 100644
--- a/protocols/bmv2/api/pom.xml
+++ b/protocols/bmv2/api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/bmv2/ctl/pom.xml b/protocols/bmv2/ctl/pom.xml
index f6dbcbb..0b64247 100644
--- a/protocols/bmv2/ctl/pom.xml
+++ b/protocols/bmv2/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/bmv2/pom.xml b/protocols/bmv2/pom.xml
index f7d9bac..759a21c 100644
--- a/protocols/bmv2/pom.xml
+++ b/protocols/bmv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-protocols</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/bmv2/thrift-api/pom.xml b/protocols/bmv2/thrift-api/pom.xml
index 0fc6bc1..c0c0c60 100644
--- a/protocols/bmv2/thrift-api/pom.xml
+++ b/protocols/bmv2/thrift-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/protocols/isis/api/pom.xml b/protocols/isis/api/pom.xml
index 03eaa80..0d31b0a 100644
--- a/protocols/isis/api/pom.xml
+++ b/protocols/isis/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-isis-api</artifactId>
diff --git a/protocols/isis/ctl/pom.xml b/protocols/isis/ctl/pom.xml
index 9b221a1..2ccfbd2 100644
--- a/protocols/isis/ctl/pom.xml
+++ b/protocols/isis/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-isis-ctl</artifactId>
diff --git a/protocols/isis/isisio/pom.xml b/protocols/isis/isisio/pom.xml
index 5b5b118..6e09233 100644
--- a/protocols/isis/isisio/pom.xml
+++ b/protocols/isis/isisio/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-isis-isisio</artifactId>
diff --git a/protocols/isis/pom.xml b/protocols/isis/pom.xml
index e067d74..124075e 100644
--- a/protocols/isis/pom.xml
+++ b/protocols/isis/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-isis</artifactId>
diff --git a/protocols/lisp/api/pom.xml b/protocols/lisp/api/pom.xml
index 77ae5d3..0026d5a 100644
--- a/protocols/lisp/api/pom.xml
+++ b/protocols/lisp/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-lisp-api</artifactId>
diff --git a/protocols/lisp/ctl/pom.xml b/protocols/lisp/ctl/pom.xml
index 7d0da91..b10a3f2 100644
--- a/protocols/lisp/ctl/pom.xml
+++ b/protocols/lisp/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-lisp-ctl</artifactId>
diff --git a/protocols/lisp/msg/pom.xml b/protocols/lisp/msg/pom.xml
index acc2206..905fbfd 100644
--- a/protocols/lisp/msg/pom.xml
+++ b/protocols/lisp/msg/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-lisp-msg</artifactId>
diff --git a/protocols/lisp/pom.xml b/protocols/lisp/pom.xml
index 8ed2f19..32ba0c8 100644
--- a/protocols/lisp/pom.xml
+++ b/protocols/lisp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-lisp</artifactId>
diff --git a/protocols/netconf/api/pom.xml b/protocols/netconf/api/pom.xml
index 2398e3b..05d1c79 100644
--- a/protocols/netconf/api/pom.xml
+++ b/protocols/netconf/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-netconf</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-netconf-api</artifactId>
diff --git a/protocols/netconf/ctl/pom.xml b/protocols/netconf/ctl/pom.xml
index bfebb99..7e6d5e1 100644
--- a/protocols/netconf/ctl/pom.xml
+++ b/protocols/netconf/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-netconf</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-netconf-ctl</artifactId>
diff --git a/protocols/netconf/pom.xml b/protocols/netconf/pom.xml
index 22eb56f..ff98bb2 100644
--- a/protocols/netconf/pom.xml
+++ b/protocols/netconf/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-netconf</artifactId>
diff --git a/protocols/openflow/api/pom.xml b/protocols/openflow/api/pom.xml
index e77163f..c3d7d17 100644
--- a/protocols/openflow/api/pom.xml
+++ b/protocols/openflow/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-of-api</artifactId>
diff --git a/protocols/openflow/ctl/pom.xml b/protocols/openflow/ctl/pom.xml
index 235f41c..e2d4d50 100644
--- a/protocols/openflow/ctl/pom.xml
+++ b/protocols/openflow/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-of-ctl</artifactId>
diff --git a/protocols/openflow/pom.xml b/protocols/openflow/pom.xml
index d65af47..eef2a1f 100644
--- a/protocols/openflow/pom.xml
+++ b/protocols/openflow/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-of</artifactId>
diff --git a/protocols/ospf/api/pom.xml b/protocols/ospf/api/pom.xml
index 1f208c6..5b64bbc 100755
--- a/protocols/ospf/api/pom.xml
+++ b/protocols/ospf/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-ospf-api</artifactId>
diff --git a/protocols/ospf/ctl/pom.xml b/protocols/ospf/ctl/pom.xml
index a05f242..6373d5a 100755
--- a/protocols/ospf/ctl/pom.xml
+++ b/protocols/ospf/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-ospf-ctl</artifactId>
diff --git a/protocols/ospf/pom.xml b/protocols/ospf/pom.xml
index 785c909..e45d4e3 100755
--- a/protocols/ospf/pom.xml
+++ b/protocols/ospf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-ospf</artifactId>
diff --git a/protocols/ospf/protocol/pom.xml b/protocols/ospf/protocol/pom.xml
index 5e15d9d..793d608 100644
--- a/protocols/ospf/protocol/pom.xml
+++ b/protocols/ospf/protocol/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-ospf-protocol</artifactId>
diff --git a/protocols/ovsdb/api/pom.xml b/protocols/ovsdb/api/pom.xml
index b31f705..3f482a1 100644
--- a/protocols/ovsdb/api/pom.xml
+++ b/protocols/ovsdb/api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <artifactId>onos-ovsdb-api</artifactId>
     <packaging>bundle</packaging>
diff --git a/protocols/ovsdb/ctl/pom.xml b/protocols/ovsdb/ctl/pom.xml
index 4215bef..afaeab5 100644
--- a/protocols/ovsdb/ctl/pom.xml
+++ b/protocols/ovsdb/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-ovsdb-ctl</artifactId>
diff --git a/protocols/ovsdb/pom.xml b/protocols/ovsdb/pom.xml
index 032e0d2..b697fbe 100644
--- a/protocols/ovsdb/pom.xml
+++ b/protocols/ovsdb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-ovsdb</artifactId>
diff --git a/protocols/ovsdb/rfc/pom.xml b/protocols/ovsdb/rfc/pom.xml
index a80d0e0..e88d420 100644
--- a/protocols/ovsdb/rfc/pom.xml
+++ b/protocols/ovsdb/rfc/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <artifactId>onos-ovsdb-rfc</artifactId>
     <packaging>bundle</packaging>
diff --git a/protocols/pcep/api/pom.xml b/protocols/pcep/api/pom.xml
index 56b817b..682ea9e 100644
--- a/protocols/pcep/api/pom.xml
+++ b/protocols/pcep/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-controller</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-pcep-controller-api</artifactId>
diff --git a/protocols/pcep/ctl/pom.xml b/protocols/pcep/ctl/pom.xml
index 5d53ff4..de814d6 100644
--- a/protocols/pcep/ctl/pom.xml
+++ b/protocols/pcep/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-controller</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-pcep-controller-impl</artifactId>
diff --git a/protocols/pcep/pcepio/pom.xml b/protocols/pcep/pcepio/pom.xml
index 4cd93a8..de429ff 100755
--- a/protocols/pcep/pcepio/pom.xml
+++ b/protocols/pcep/pcepio/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-controller</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-pcepio</artifactId>
diff --git a/protocols/pcep/pom.xml b/protocols/pcep/pom.xml
index d452e2c..19dfa8c 100755
--- a/protocols/pcep/pom.xml
+++ b/protocols/pcep/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-pcep-controller</artifactId>
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 9ba770d..a699dd9 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-protocols</artifactId>
diff --git a/protocols/rest/api/pom.xml b/protocols/rest/api/pom.xml
index d7d9858..d3bd4a4 100644
--- a/protocols/rest/api/pom.xml
+++ b/protocols/rest/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-restsb</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-restsb-api</artifactId>
diff --git a/protocols/rest/ctl/pom.xml b/protocols/rest/ctl/pom.xml
index 41022d0..b80de90 100644
--- a/protocols/rest/ctl/pom.xml
+++ b/protocols/rest/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-restsb</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/rest/pom.xml b/protocols/rest/pom.xml
index b867856..ac0a75d 100644
--- a/protocols/rest/pom.xml
+++ b/protocols/rest/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-protocols</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/restconf/client/api/pom.xml b/protocols/restconf/client/api/pom.xml
index c64589e..8c927e8 100644
--- a/protocols/restconf/client/api/pom.xml
+++ b/protocols/restconf/client/api/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-restconf-client</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>onos-restconf-client-api</artifactId>
diff --git a/protocols/restconf/client/ctl/pom.xml b/protocols/restconf/client/ctl/pom.xml
index 63c7615..6dd0724 100644
--- a/protocols/restconf/client/ctl/pom.xml
+++ b/protocols/restconf/client/ctl/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-restconf-client</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>onos-restconf-client-ctl</artifactId>
diff --git a/protocols/restconf/client/pom.xml b/protocols/restconf/client/pom.xml
index 77a8c60..6aafc59 100644
--- a/protocols/restconf/client/pom.xml
+++ b/protocols/restconf/client/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-restconf</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>onos-restconf-client</artifactId>
diff --git a/protocols/restconf/pom.xml b/protocols/restconf/pom.xml
index 28d872d..ac2d669 100644
--- a/protocols/restconf/pom.xml
+++ b/protocols/restconf/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-protocols</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
   </parent>
 
   <artifactId>onos-restconf</artifactId>
diff --git a/protocols/restconf/server/api/pom.xml b/protocols/restconf/server/api/pom.xml
index 01dc39b..eed298b 100644
--- a/protocols/restconf/server/api/pom.xml
+++ b/protocols/restconf/server/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restconf-server</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/restconf/server/app/pom.xml b/protocols/restconf/server/app/pom.xml
index f3ad849..ab3b374 100644
--- a/protocols/restconf/server/app/pom.xml
+++ b/protocols/restconf/server/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restconf-server</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/restconf/server/pom.xml b/protocols/restconf/server/pom.xml
index 1ee6741..b1d9bd8 100644
--- a/protocols/restconf/server/pom.xml
+++ b/protocols/restconf/server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restconf</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/restconf/server/restconfmgr/pom.xml b/protocols/restconf/server/restconfmgr/pom.xml
index 9b53639..8de5f66 100644
--- a/protocols/restconf/server/restconfmgr/pom.xml
+++ b/protocols/restconf/server/restconfmgr/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restconf-server</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/restconf/server/rpp/pom.xml b/protocols/restconf/server/rpp/pom.xml
index ed2556a..95d4475 100644
--- a/protocols/restconf/server/rpp/pom.xml
+++ b/protocols/restconf/server/rpp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restconf-server</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/restconf/server/utils/pom.xml b/protocols/restconf/server/utils/pom.xml
index fd9ab0f..831542c 100644
--- a/protocols/restconf/server/utils/pom.xml
+++ b/protocols/restconf/server/utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>onos-restconf-server</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/snmp/api/pom.xml b/protocols/snmp/api/pom.xml
index c7be52e..975338a 100644
--- a/protocols/snmp/api/pom.xml
+++ b/protocols/snmp/api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-snmp-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/snmp/ctl/pom.xml b/protocols/snmp/ctl/pom.xml
index 06da017..963fa6a 100644
--- a/protocols/snmp/ctl/pom.xml
+++ b/protocols/snmp/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-snmp-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-snmp-api</artifactId>
-            <version>1.8.5-SNAPSHOT</version>
+            <version>1.8.5</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/protocols/snmp/pom.xml b/protocols/snmp/pom.xml
index cece2df..be61c3f 100644
--- a/protocols/snmp/pom.xml
+++ b/protocols/snmp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-protocols</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/bgp/app/pom.xml b/providers/bgp/app/pom.xml
index b4ceb7b..04ef85d 100755
--- a/providers/bgp/app/pom.xml
+++ b/providers/bgp/app/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-bgp-app</artifactId>
diff --git a/providers/bgp/cfg/pom.xml b/providers/bgp/cfg/pom.xml
index 65b996f..8ba110b 100755
--- a/providers/bgp/cfg/pom.xml
+++ b/providers/bgp/cfg/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <artifactId>onos-bgp-provider-cfg</artifactId>
     <packaging>bundle</packaging>
diff --git a/providers/bgp/pom.xml b/providers/bgp/pom.xml
index 9928436..5526f5a 100644
--- a/providers/bgp/pom.xml
+++ b/providers/bgp/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-providers</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
   </parent>
   <artifactId>onos-bgp-providers</artifactId>
   <packaging>pom</packaging>
diff --git a/providers/bgp/topology/pom.xml b/providers/bgp/topology/pom.xml
index 389c6ee..cb08f34 100755
--- a/providers/bgp/topology/pom.xml
+++ b/providers/bgp/topology/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-bgp-providers</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
   </parent>
   <artifactId>onos-bgp-provider-topology</artifactId>
   <packaging>bundle</packaging>
diff --git a/providers/bgpcep/app/pom.xml b/providers/bgpcep/app/pom.xml
index f5f36b2..1f2cf9b 100644
--- a/providers/bgpcep/app/pom.xml
+++ b/providers/bgpcep/app/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgpcep-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-bgpcep-app</artifactId>
diff --git a/providers/bgpcep/flow/pom.xml b/providers/bgpcep/flow/pom.xml
index d9c692c..cca6722 100644
--- a/providers/bgpcep/flow/pom.xml
+++ b/providers/bgpcep/flow/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgpcep-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-bgpcep-provider-flow</artifactId>
diff --git a/providers/bgpcep/pom.xml b/providers/bgpcep/pom.xml
index 000c3d0..f1093c4 100644
--- a/providers/bgpcep/pom.xml
+++ b/providers/bgpcep/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-providers</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
   </parent>
 
   <artifactId>onos-bgpcep-providers</artifactId>
diff --git a/providers/bmv2/app/pom.xml b/providers/bmv2/app/pom.xml
index c67e0c4..2b9e192 100644
--- a/providers/bmv2/app/pom.xml
+++ b/providers/bmv2/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/providers/bmv2/device/pom.xml b/providers/bmv2/device/pom.xml
index 46d0112..c1cda78 100644
--- a/providers/bmv2/device/pom.xml
+++ b/providers/bmv2/device/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/bmv2/packet/pom.xml b/providers/bmv2/packet/pom.xml
index 4b3b653..8e530e1 100644
--- a/providers/bmv2/packet/pom.xml
+++ b/providers/bmv2/packet/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/bmv2/pom.xml b/providers/bmv2/pom.xml
index 5c6dc6b..68e4ff9 100644
--- a/providers/bmv2/pom.xml
+++ b/providers/bmv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/providers/host/pom.xml b/providers/host/pom.xml
index 49d5485..9bb682f 100644
--- a/providers/host/pom.xml
+++ b/providers/host/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-host-provider</artifactId>
diff --git a/providers/ietfte/app/pom.xml b/providers/ietfte/app/pom.xml
index c6fe94d..c706c83 100644
--- a/providers/ietfte/app/pom.xml
+++ b/providers/ietfte/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-ietfte-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/ietfte/pom.xml b/providers/ietfte/pom.xml
index 2052f9f..ac15d48 100644
--- a/providers/ietfte/pom.xml
+++ b/providers/ietfte/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -50,12 +50,12 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-yms-api</artifactId>
-            <version>1.8.5-SNAPSHOT</version>
+            <version>1.8.5</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-restconf-server-utils</artifactId>
-            <version>1.8.5-SNAPSHOT</version>
+            <version>1.8.5</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/providers/ietfte/topology/pom.xml b/providers/ietfte/topology/pom.xml
index a2b60e3..ae6ec8e 100644
--- a/providers/ietfte/topology/pom.xml
+++ b/providers/ietfte/topology/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-ietfte-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/providers/ietfte/tunnel/pom.xml b/providers/ietfte/tunnel/pom.xml
index 8672946..6eb5f5e 100755
--- a/providers/ietfte/tunnel/pom.xml
+++ b/providers/ietfte/tunnel/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-ietfte-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>
diff --git a/providers/ietfte/utils/pom.xml b/providers/ietfte/utils/pom.xml
index 719bdb9..ef1fba3 100755
--- a/providers/ietfte/utils/pom.xml
+++ b/providers/ietfte/utils/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>onos-ietfte-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>onos-ietfte-provider-utils</artifactId>
diff --git a/providers/isis/app/pom.xml b/providers/isis/app/pom.xml
index 96be230..3df3d52 100644
--- a/providers/isis/app/pom.xml
+++ b/providers/isis/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-isis-app</artifactId>
diff --git a/providers/isis/cfg/pom.xml b/providers/isis/cfg/pom.xml
index 1dcd5a9..253307b 100644
--- a/providers/isis/cfg/pom.xml
+++ b/providers/isis/cfg/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-isis-provider-cfg</artifactId>
diff --git a/providers/isis/cli/pom.xml b/providers/isis/cli/pom.xml
index 688a068..ae43881 100644
--- a/providers/isis/cli/pom.xml
+++ b/providers/isis/cli/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-isis-provider-cli</artifactId>
diff --git a/providers/isis/pom.xml b/providers/isis/pom.xml
index 8000e7e..0a686af 100644
--- a/providers/isis/pom.xml
+++ b/providers/isis/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-isis-providers</artifactId>
diff --git a/providers/isis/topology/pom.xml b/providers/isis/topology/pom.xml
index 4fe22d5..b266602 100644
--- a/providers/isis/topology/pom.xml
+++ b/providers/isis/topology/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-isis-provider-topology</artifactId>
diff --git a/providers/link/pom.xml b/providers/link/pom.xml
index 11efe87..0d257fa 100644
--- a/providers/link/pom.xml
+++ b/providers/link/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
 
diff --git a/providers/lisp/app/pom.xml b/providers/lisp/app/pom.xml
index d38af68..1c2f992 100644
--- a/providers/lisp/app/pom.xml
+++ b/providers/lisp/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-lisp-app</artifactId>
diff --git a/providers/lisp/device/pom.xml b/providers/lisp/device/pom.xml
index ece8475..75b5b32 100644
--- a/providers/lisp/device/pom.xml
+++ b/providers/lisp/device/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-lisp-provider-device</artifactId>
diff --git a/providers/lisp/pom.xml b/providers/lisp/pom.xml
index 2593830..f74437b 100644
--- a/providers/lisp/pom.xml
+++ b/providers/lisp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-lisp-providers</artifactId>
diff --git a/providers/lldp/pom.xml b/providers/lldp/pom.xml
index f96103d..d7dd4e2 100644
--- a/providers/lldp/pom.xml
+++ b/providers/lldp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-lldp-provider</artifactId>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-lldp-provider-common</artifactId>
-            <version>1.8.5-SNAPSHOT</version>
+            <version>1.8.5</version>
         </dependency>
 
         <dependency>
diff --git a/providers/lldpcommon/pom.xml b/providers/lldpcommon/pom.xml
index 7c0efca..3d0935a 100644
--- a/providers/lldpcommon/pom.xml
+++ b/providers/lldpcommon/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
 
diff --git a/providers/netcfghost/pom.xml b/providers/netcfghost/pom.xml
index ebacb85..4bb3e63 100644
--- a/providers/netcfghost/pom.xml
+++ b/providers/netcfghost/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/netcfglinks/pom.xml b/providers/netcfglinks/pom.xml
index f9235d0..f3ff4d3 100644
--- a/providers/netcfglinks/pom.xml
+++ b/providers/netcfglinks/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-lldp-provider-common</artifactId>
-            <version>1.8.5-SNAPSHOT</version>
+            <version>1.8.5</version>
         </dependency>
 
         <dependency>
diff --git a/providers/netconf/alarm/pom.xml b/providers/netconf/alarm/pom.xml
index 1176480..f3f0ce3 100644
--- a/providers/netconf/alarm/pom.xml
+++ b/providers/netconf/alarm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>onos-netconf-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/netconf/app/pom.xml b/providers/netconf/app/pom.xml
index 2af5f23..507c99e 100644
--- a/providers/netconf/app/pom.xml
+++ b/providers/netconf/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-netconf-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-netconf-app</artifactId>
diff --git a/providers/netconf/device/pom.xml b/providers/netconf/device/pom.xml
index de2162c..e48e602 100644
--- a/providers/netconf/device/pom.xml
+++ b/providers/netconf/device/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-netconf-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-netconf-provider-device</artifactId>
diff --git a/providers/netconf/pom.xml b/providers/netconf/pom.xml
index 034ae88..b21191e 100644
--- a/providers/netconf/pom.xml
+++ b/providers/netconf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-netconf-providers</artifactId>
diff --git a/providers/null/pom.xml b/providers/null/pom.xml
index 7737f50..2a815da 100644
--- a/providers/null/pom.xml
+++ b/providers/null/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-null-provider</artifactId>
diff --git a/providers/openflow/app/pom.xml b/providers/openflow/app/pom.xml
index ffae554..65aae8b 100644
--- a/providers/openflow/app/pom.xml
+++ b/providers/openflow/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-openflow</artifactId>
diff --git a/providers/openflow/base/pom.xml b/providers/openflow/base/pom.xml
index 4d33e32..92828e4 100644
--- a/providers/openflow/base/pom.xml
+++ b/providers/openflow/base/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-openflow-base</artifactId>
diff --git a/providers/openflow/device/pom.xml b/providers/openflow/device/pom.xml
index eecf381..199553b 100644
--- a/providers/openflow/device/pom.xml
+++ b/providers/openflow/device/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-of-provider-device</artifactId>
diff --git a/providers/openflow/flow/pom.xml b/providers/openflow/flow/pom.xml
index 8da28ca..1114ca7 100644
--- a/providers/openflow/flow/pom.xml
+++ b/providers/openflow/flow/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-of-provider-flow</artifactId>
diff --git a/providers/openflow/group/pom.xml b/providers/openflow/group/pom.xml
index ea4335d..ac121d1 100644
--- a/providers/openflow/group/pom.xml
+++ b/providers/openflow/group/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-of-provider-group</artifactId>
diff --git a/providers/openflow/message/pom.xml b/providers/openflow/message/pom.xml
index 0a9580d..7eae689 100644
--- a/providers/openflow/message/pom.xml
+++ b/providers/openflow/message/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-of-provider-message</artifactId>
diff --git a/providers/openflow/meter/pom.xml b/providers/openflow/meter/pom.xml
index 9f08749..a98d6f2 100644
--- a/providers/openflow/meter/pom.xml
+++ b/providers/openflow/meter/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-of-provider-meter</artifactId>
diff --git a/providers/openflow/packet/pom.xml b/providers/openflow/packet/pom.xml
index 9e0ef96..b577f0c 100644
--- a/providers/openflow/packet/pom.xml
+++ b/providers/openflow/packet/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-of-provider-packet</artifactId>
diff --git a/providers/openflow/pom.xml b/providers/openflow/pom.xml
index 92df359..e1e8f18 100644
--- a/providers/openflow/pom.xml
+++ b/providers/openflow/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-of-providers</artifactId>
diff --git a/providers/ospf/app/pom.xml b/providers/ospf/app/pom.xml
index 8638163..a5bd10b 100644
--- a/providers/ospf/app/pom.xml
+++ b/providers/ospf/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/providers/ospf/cfg/pom.xml b/providers/ospf/cfg/pom.xml
index b4bfa28..ef67acf 100644
--- a/providers/ospf/cfg/pom.xml
+++ b/providers/ospf/cfg/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/providers/ospf/cli/pom.xml b/providers/ospf/cli/pom.xml
index 34e6c77..5dd92f9 100644
--- a/providers/ospf/cli/pom.xml
+++ b/providers/ospf/cli/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/providers/ospf/pom.xml b/providers/ospf/pom.xml
index 51584ee..f766254 100644
--- a/providers/ospf/pom.xml
+++ b/providers/ospf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/providers/ospf/topology/pom.xml b/providers/ospf/topology/pom.xml
index 8d1868a..3eca7ff 100644
--- a/providers/ospf/topology/pom.xml
+++ b/providers/ospf/topology/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/providers/ovsdb/app/pom.xml b/providers/ovsdb/app/pom.xml
index 313d7e9..40cb9c7 100644
--- a/providers/ovsdb/app/pom.xml
+++ b/providers/ovsdb/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-ovsdatabase</artifactId>
diff --git a/providers/ovsdb/base/pom.xml b/providers/ovsdb/base/pom.xml
index 2c1a187..42b842e 100644
--- a/providers/ovsdb/base/pom.xml
+++ b/providers/ovsdb/base/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-ovsdb-base</artifactId>
diff --git a/providers/ovsdb/device/pom.xml b/providers/ovsdb/device/pom.xml
index b7bf352..7ab1b70 100644
--- a/providers/ovsdb/device/pom.xml
+++ b/providers/ovsdb/device/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-ovsdb-provider-device</artifactId>
diff --git a/providers/ovsdb/host/pom.xml b/providers/ovsdb/host/pom.xml
index a9c0be6..7b6e5e2 100644
--- a/providers/ovsdb/host/pom.xml
+++ b/providers/ovsdb/host/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-ovsdb-provider-host</artifactId>
diff --git a/providers/ovsdb/pom.xml b/providers/ovsdb/pom.xml
index e44d3e9..3c7d3c3 100644
--- a/providers/ovsdb/pom.xml
+++ b/providers/ovsdb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-ovsdb-providers</artifactId>
diff --git a/providers/ovsdb/tunnel/pom.xml b/providers/ovsdb/tunnel/pom.xml
index d431766..dbd3bb3 100644
--- a/providers/ovsdb/tunnel/pom.xml
+++ b/providers/ovsdb/tunnel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-ovsdb-provider-tunnel</artifactId>
diff --git a/providers/pcep/app/pom.xml b/providers/pcep/app/pom.xml
index 1d9f9ab..cc38da3 100644
--- a/providers/pcep/app/pom.xml
+++ b/providers/pcep/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-pcep</artifactId>
diff --git a/providers/pcep/pom.xml b/providers/pcep/pom.xml
index 97b4b7a..1f1e57f 100644
--- a/providers/pcep/pom.xml
+++ b/providers/pcep/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-providers</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
   </parent>
   <artifactId>onos-pcep-providers</artifactId>
   <packaging>pom</packaging>
diff --git a/providers/pcep/topology/pom.xml b/providers/pcep/topology/pom.xml
index 538cdc3..53a5d94 100644
--- a/providers/pcep/topology/pom.xml
+++ b/providers/pcep/topology/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-pcep-providers</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
   </parent>
   <artifactId>onos-pcep-provider-topology</artifactId>
   <packaging>bundle</packaging>
diff --git a/providers/pcep/tunnel/pom.xml b/providers/pcep/tunnel/pom.xml
index 8f57aeb..ceab60f 100644
--- a/providers/pcep/tunnel/pom.xml
+++ b/providers/pcep/tunnel/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <artifactId>onos-pcep-provider-tunnel</artifactId>
     <packaging>bundle</packaging>
diff --git a/providers/pom.xml b/providers/pom.xml
index 7dbc4b2..37b14f5 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-providers</artifactId>
diff --git a/providers/rest/app/pom.xml b/providers/rest/app/pom.xml
index ca6f09c..2766633 100644
--- a/providers/rest/app/pom.xml
+++ b/providers/rest/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restsb-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/rest/device/pom.xml b/providers/rest/device/pom.xml
index 4b3bb74..f9bd3ed 100644
--- a/providers/rest/device/pom.xml
+++ b/providers/rest/device/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-restsb-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/rest/pom.xml b/providers/rest/pom.xml
index a456169..0c269fe 100644
--- a/providers/rest/pom.xml
+++ b/providers/rest/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/snmp/app/pom.xml b/providers/snmp/app/pom.xml
index a4a9c1d..edc6841 100644
--- a/providers/snmp/app/pom.xml
+++ b/providers/snmp/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-snmp-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-snmp-app</artifactId>
diff --git a/providers/snmp/device/pom.xml b/providers/snmp/device/pom.xml
index 04d8cd5..acf07b5 100644
--- a/providers/snmp/device/pom.xml
+++ b/providers/snmp/device/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-snmp-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-snmp-provider-device</artifactId>
@@ -38,12 +38,12 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-snmp-api</artifactId>
-            <version>1.8.5-SNAPSHOT</version>
+            <version>1.8.5</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-snmp-ctl</artifactId>
-            <version>1.8.5-SNAPSHOT</version>
+            <version>1.8.5</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
diff --git a/providers/snmp/pom.xml b/providers/snmp/pom.xml
index 943f7b2..cb7035e 100644
--- a/providers/snmp/pom.xml
+++ b/providers/snmp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-snmp-providers</artifactId>
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index 9374a40..e96b9ba 100644
--- a/tools/build/envDefaults
+++ b/tools/build/envDefaults
@@ -18,7 +18,7 @@
 export BUILD_NUMBER=${BUILD_NUMBER:-$(id -un)}
 
 # ONOS Version and onos.tar.gz staging environment
-export ONOS_POM_VERSION="1.8.5-SNAPSHOT"
+export ONOS_POM_VERSION="1.8.5"
 export ONOS_VERSION=${ONOS_VERSION:-1.8.5.$BUILD_NUMBER}
 
 # ONOS production bits (onos.tar.gz, onos.zip, onos.deb, onos.rpm) staging environment
diff --git a/tools/build/onos-prepare-sonar b/tools/build/onos-prepare-sonar
index 7ea7917..532dbf9 100755
--- a/tools/build/onos-prepare-sonar
+++ b/tools/build/onos-prepare-sonar
@@ -12,7 +12,7 @@
 from subprocess import call, check_call, check_output
 
 # FIXME pull the version from the Buck version file
-ONOS_VERSION='1.8.5-SNAPSHOT'
+ONOS_VERSION='1.8.5'
 
 # SonarQube property file name and template
 FILE_NAME = 'sonar-project.properties'
diff --git a/tools/package/archetypes/api/pom.xml b/tools/package/archetypes/api/pom.xml
index 375a7eb..839043a 100644
--- a/tools/package/archetypes/api/pom.xml
+++ b/tools/package/archetypes/api/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
   </parent>
 
   <artifactId>onos-api-archetype</artifactId>
diff --git a/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml
index 06d4d3b..0f91a09 100644
--- a/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.5-SNAPSHOT</onos.version>
+        <onos.version>1.8.5</onos.version>
     </properties>
 
     <dependencies>
diff --git a/tools/package/archetypes/bundle/pom.xml b/tools/package/archetypes/bundle/pom.xml
index 7390ffa..99b8ae7 100644
--- a/tools/package/archetypes/bundle/pom.xml
+++ b/tools/package/archetypes/bundle/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
   </parent>
 
   <artifactId>onos-bundle-archetype</artifactId>
diff --git a/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
index 4986ebf..b723e8a 100644
--- a/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.5-SNAPSHOT</onos.version>
+        <onos.version>1.8.5</onos.version>
         <!-- Uncomment to generate ONOS app from this module.
         <onos.app.name>org.foo.app</onos.app.name>
         <onos.app.title>Foo App</onos.app.title>
diff --git a/tools/package/archetypes/cli/pom.xml b/tools/package/archetypes/cli/pom.xml
index 06c0100..5670759 100644
--- a/tools/package/archetypes/cli/pom.xml
+++ b/tools/package/archetypes/cli/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
   </parent>
 
   <artifactId>onos-cli-archetype</artifactId>
diff --git a/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
index fd193ef..0a3e494 100644
--- a/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.5-SNAPSHOT</onos.version>
+        <onos.version>1.8.5</onos.version>
     </properties>
 
     <dependencies>
diff --git a/tools/package/archetypes/pom.xml b/tools/package/archetypes/pom.xml
index 68f1310..89f8208 100644
--- a/tools/package/archetypes/pom.xml
+++ b/tools/package/archetypes/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
     <packaging>pom</packaging>
 
     <description>ONOS archetypes project</description>
diff --git a/tools/package/archetypes/rest/pom.xml b/tools/package/archetypes/rest/pom.xml
index 9006a7a..ee119af 100644
--- a/tools/package/archetypes/rest/pom.xml
+++ b/tools/package/archetypes/rest/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
   </parent>
 
   <artifactId>onos-rest-archetype</artifactId>
diff --git a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
index 2cdf03d3..88fe45c 100644
--- a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.5-SNAPSHOT</onos.version>
+        <onos.version>1.8.5</onos.version>
 
         <web.context>/onos/${artifactId}</web.context>
         <api.version>1.0.0</api.version>
diff --git a/tools/package/archetypes/ui/pom.xml b/tools/package/archetypes/ui/pom.xml
index 5eba7f7..1c16c75 100644
--- a/tools/package/archetypes/ui/pom.xml
+++ b/tools/package/archetypes/ui/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
   </parent>
 
   <artifactId>onos-ui-archetype</artifactId>
diff --git a/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
index cc43409..a0b9284 100644
--- a/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.5-SNAPSHOT</onos.version>
+        <onos.version>1.8.5</onos.version>
         <!-- Uncomment to generate ONOS app from this module.
         <onos.app.name>org.foo.app</onos.app.name>
         <onos.app.title>Foo App</onos.app.title>
diff --git a/tools/package/archetypes/uitab/pom.xml b/tools/package/archetypes/uitab/pom.xml
index 9f3aa4c..f4d5044 100644
--- a/tools/package/archetypes/uitab/pom.xml
+++ b/tools/package/archetypes/uitab/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
   </parent>
 
   <artifactId>onos-uitab-archetype</artifactId>
diff --git a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
index 720df3a..7546d09 100644
--- a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.5-SNAPSHOT</onos.version>
+        <onos.version>1.8.5</onos.version>
         <!-- Uncomment to generate ONOS app from this module.
         <onos.app.name>org.foo.app</onos.app.name>
         <onos.app.title>Foo App</onos.app.title>
diff --git a/tools/package/archetypes/uitopo/pom.xml b/tools/package/archetypes/uitopo/pom.xml
index 150c771..ca4c5c6 100644
--- a/tools/package/archetypes/uitopo/pom.xml
+++ b/tools/package/archetypes/uitopo/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.5-SNAPSHOT</version>
+    <version>1.8.5</version>
   </parent>
 
   <artifactId>onos-uitopo-archetype</artifactId>
diff --git a/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
index 29b980d..4e0bc62 100644
--- a/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.5-SNAPSHOT</onos.version>
+        <onos.version>1.8.5</onos.version>
         <!-- Uncomment to generate ONOS app from this module.
         <onos.app.name>org.foo.app</onos.app.name>
         <onos.app.title>Foo App</onos.app.title>
diff --git a/tools/package/branding/pom.xml b/tools/package/branding/pom.xml
index a7a02e4..1f29814 100644
--- a/tools/package/branding/pom.xml
+++ b/tools/package/branding/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/tools/test/bin/onos-archetypes-test b/tools/test/bin/onos-archetypes-test
index b5cbcd9..6c067f0 100755
--- a/tools/test/bin/onos-archetypes-test
+++ b/tools/test/bin/onos-archetypes-test
@@ -19,7 +19,7 @@
 set -e
 
 export AROOT=${ONOS_STAGE_ROOT:-/tmp}/foo
-export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=1.8.5-SNAPSHOT"
+export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=1.8.5"
 
 mkdir -p $AROOT
 for an in api bundle cli rest ui uitab uitopo; do
diff --git a/utils/junit/pom.xml b/utils/junit/pom.xml
index ad5af71..716e8a15 100644
--- a/utils/junit/pom.xml
+++ b/utils/junit/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onlab-utils</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onlab-junit</artifactId>
diff --git a/utils/misc/pom.xml b/utils/misc/pom.xml
index 49aee91..1c07506 100644
--- a/utils/misc/pom.xml
+++ b/utils/misc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onlab-utils</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onlab-misc</artifactId>
diff --git a/utils/osgi/pom.xml b/utils/osgi/pom.xml
index 384161a..8389f95 100644
--- a/utils/osgi/pom.xml
+++ b/utils/osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onlab-utils</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onlab-osgi</artifactId>
diff --git a/utils/osgiwrap/pom.xml b/utils/osgiwrap/pom.xml
index b81ed64..d98aaf0 100644
--- a/utils/osgiwrap/pom.xml
+++ b/utils/osgiwrap/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onlab-utils</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/utils/pom.xml b/utils/pom.xml
index 42b57c9..20ea24b 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onlab-utils</artifactId>
diff --git a/utils/rest/pom.xml b/utils/rest/pom.xml
index d595bdd..86c983e 100644
--- a/utils/rest/pom.xml
+++ b/utils/rest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onlab-utils</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onlab-rest</artifactId>
diff --git a/web/api/pom.xml b/web/api/pom.xml
index e156a09..d35d0e3 100644
--- a/web/api/pom.xml
+++ b/web/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-web</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-rest</artifactId>
diff --git a/web/gui/pom.xml b/web/gui/pom.xml
index 2e7d292..2c57653 100644
--- a/web/gui/pom.xml
+++ b/web/gui/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-web</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-gui</artifactId>
diff --git a/web/pom.xml b/web/pom.xml
index 32af1d4..c23c8af 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.5</version>
     </parent>
 
     <artifactId>onos-web</artifactId>