diff --git a/.gitignore b/.gitignore
index 8f1c1a9..1154284 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,9 @@
 voltha/**/*.desc
 **/*_pb2.py
 **/*_pb2_grpc.py
+envoy/proto.pb
+envoy/go/envoyd/buildreport
+envoy/go/envoyd/envoyd
 
 # Editors
 *.bak
diff --git a/docker/Dockerfile.onos b/docker/Dockerfile.onos
index 10f385b..43645e0 100644
--- a/docker/Dockerfile.onos
+++ b/docker/Dockerfile.onos
@@ -1,4 +1,4 @@
-FROM onosproject/onos:1.8 as build
+FROM onosproject/onos:1.10.3 as build
 MAINTAINER Open Networking Foundation <info@opennetworking.org>
 
 # Install and configure build tools
@@ -11,7 +11,7 @@
 # must be replicated below to the final image as they are shared between stages
 ENV ONOS=/root/onos
 ENV APPS_ROOT=${ONOS}/apps
-ENV KARAF_VERSION=3.0.5
+ENV KARAF_VERSION=3.0.8
 ENV KARAF_ROOT=${ONOS}/apache-karaf-${KARAF_VERSION}
 ENV KARAF_M2=${KARAF_ROOT}/system
 ENV MANIFEST_BRANCH=master
@@ -26,15 +26,15 @@
 RUN mvn -DskipTests=true clean install
 
 # Specify application versions to install
-ENV AAA_VERSION=1.2.0-SNAPSHOT \
-	CONFIG_VERSION=1.2.0-SNAPSHOT \
-	IGMP_VERSION=1.2.0-SNAPSHOT \
-	IGMP_PROXY_VERSION=1.0.0-SNAPSHOT \
-	MCAST_VERSION=1.2.0-SNAPSHOT \
-	OLT_VERSION=1.2.0-SNAPSHOT \
-	SADIS_VERSION=1.0.0-SNAPSHOT \
-	VTN_VERSION=1.2.0-SNAPSHOT \
-	L2_DHCP_RELAY_VERSION=1.0.0-SNAPSHOT
+ENV AAA_VERSION=1.3.0-SNAPSHOT \
+	CONFIG_VERSION=1.3.0-SNAPSHOT \
+	IGMP_VERSION=1.3.0-SNAPSHOT \
+	IGMP_PROXY_VERSION=1.1.0-SNAPSHOT \
+	MCAST_VERSION=1.3.0-SNAPSHOT \
+	OLT_VERSION=1.3.0-SNAPSHOT \
+	SADIS_VERSION=1.1.0-SNAPSHOT \
+	VTN_VERSION=1.3.0-SNAPSHOT \
+	L2_DHCP_RELAY_VERSION=1.1.0-SNAPSHOT
 
 ENV APPS="aaa-${AAA_VERSION} \
 	cord-config-${CONFIG_VERSION} \
@@ -53,13 +53,13 @@
 RUN ./app-install.sh
 
 # Create the final image coping over the installed applications from the build stage
-FROM onosproject/onos:1.8
+FROM onosproject/onos:1.10.3
 
 # Install Key Store Options
 ENV JAVA_OPTS="${JAVA_OPTS:--DenableOFTLS=true -Djavax.net.ssl.keyStore=/home/sdn/wiki/onos.jks -Djavax.net.ssl.keyStorePassword=222222 -Djavax.net.ssl.trustStore=/home/sdn/wiki/onos.jks -Djavax.net.ssl.trustStorePassword=222222}"
 
 ENV ONOS=/root/onos
-ENV KARAF_VERSION=3.0.5
+ENV KARAF_VERSION=3.0.8
 ENV KARAF_ROOT=${ONOS}/apache-karaf-${KARAF_VERSION}
 ENV KARAF_M2=${KARAF_ROOT}/system
 ENV APPS_ROOT=${ONOS}/apps
diff --git a/docker/config/app-install.sh b/docker/config/app-install.sh
index 4bb8808..ec39263 100644
--- a/docker/config/app-install.sh
+++ b/docker/config/app-install.sh
@@ -13,7 +13,7 @@
     mkdir -p $APP_INSTALL_ROOT
     cd $APP_INSTALL_ROOT
     cp $oar $APP_INSTALL_ROOT
-    jar -xf $APP_INSTALL_ROOT/$(basename $oar)
+    unzip -oq -d . $APP_INSTALL_ROOT/$(basename $oar)
     name=$(grep "name=" $APP_INSTALL_ROOT/app.xml | sed 's/<app name="//g;s/".*//g')
     mkdir -p $APPS_ROOT/$name
     cp $APP_INSTALL_ROOT/app.xml $APPS_ROOT/$name/app.xml