diff --git a/Dockerfile.voltha-onos b/Dockerfile.voltha-onos
index dbd2c0b..94d8c1f 100644
--- a/Dockerfile.voltha-onos
+++ b/Dockerfile.voltha-onos
@@ -34,7 +34,7 @@
 
 
 # Unpack and install specific apps from download stage
-FROM onosproject/onos:2.5-latest as install
+FROM onosproject/onos:2.5.5 as install
 
 # The ENV settings must be replicated below as they are not shared between stages
 ENV ONOS=/root/onos
@@ -58,7 +58,7 @@
 
 
 # Create the final image coping over the installed applications from the install stage
-FROM onosproject/onos:2.5-latest
+FROM onosproject/onos:2.5.5
 
 # The ENV settings must be replicated below as they are not shared between stages
 ENV ONOS=/root/onos
diff --git a/VERSION b/VERSION
index 403e252..2d6c0bc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.0.4-dev8
+5.0.4
diff --git a/dependencies.xml b/dependencies.xml
index c6789fe..a6153c9 100644
--- a/dependencies.xml
+++ b/dependencies.xml
@@ -24,13 +24,13 @@
     <version>fake</version>
 
     <properties>
-        <olt.version>5.0.0-SNAPSHOT</olt.version>
-        <sadis.version>5.5.0-SNAPSHOT</sadis.version>
-        <aaa.version>2.5.0-SNAPSHOT</aaa.version>
-        <dhcpl2relay.version>2.6.0-SNAPSHOT</dhcpl2relay.version>
-        <kafka.version>2.8.0-SNAPSHOT</kafka.version>
-        <igmpproxy.version>2.4.0-SNAPSHOT</igmpproxy.version>
-        <mcast.version>2.5.0-SNAPSHOT</mcast.version>
+        <olt.version>5.0.0</olt.version>
+        <sadis.version>5.5.1</sadis.version>
+        <aaa.version>2.5.0</aaa.version>
+        <dhcpl2relay.version>2.6.0</dhcpl2relay.version>
+        <kafka.version>2.8.0</kafka.version>
+        <igmpproxy.version>2.4.0</igmpproxy.version>
+        <mcast.version>2.5.0</mcast.version>
         <segmentrouting.version>3.0.0</segmentrouting.version>
     </properties>