diff --git a/Dockerfile.voltha-onos b/Dockerfile.voltha-onos
index c96a728..73c6c08 100644
--- a/Dockerfile.voltha-onos
+++ b/Dockerfile.voltha-onos
@@ -14,7 +14,7 @@
 
 
 # Download and copy the specified onos apps
-FROM maven:3.6.1-jdk-8-alpine as download
+FROM maven:3.6.3-openjdk-11-slim as download
 
 # The ENV settings must be replicated below as they are not shared between stages
 ENV DOWNLOAD_ROOT=/download
diff --git a/VERSION b/VERSION
index 50e2274..b15dca8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.0.3
+5.0.4-dev
diff --git a/dependencies.xml b/dependencies.xml
index 9fc7918..c6789fe 100644
--- a/dependencies.xml
+++ b/dependencies.xml
@@ -24,13 +24,13 @@
     <version>fake</version>
 
     <properties>
-        <olt.version>4.5.0</olt.version>
-        <sadis.version>5.4.0</sadis.version>
-        <aaa.version>2.4.0</aaa.version>
-        <dhcpl2relay.version>2.5.0</dhcpl2relay.version>
-        <kafka.version>2.7.0</kafka.version>
-        <igmpproxy.version>2.3.0</igmpproxy.version>
-        <mcast.version>2.4.0</mcast.version>
+        <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>
         <segmentrouting.version>3.0.0</segmentrouting.version>
     </properties>