diff --git a/ci/Dockerfile/fedora25.x86_64 b/ci/Dockerfile/fedora25.x86_64
deleted file mode 120000
index c6db8fc..0000000
--- a/ci/Dockerfile/fedora25.x86_64
+++ /dev/null
@@ -1 +0,0 @@
-fedora25
\ No newline at end of file
diff --git a/ci/Dockerfile/fedora25 b/ci/Dockerfile/fedora27
similarity index 96%
rename from ci/Dockerfile/fedora25
rename to ci/Dockerfile/fedora27
index 433f948..ff77500 100644
--- a/ci/Dockerfile/fedora25
+++ b/ci/Dockerfile/fedora27
@@ -1,4 +1,4 @@
-FROM fedora:25
+FROM fedora:27
 RUN dnf -y remove vim-minimal
 RUN dnf -y install gcc-c++ flex bison git ctags cscope expat-devel patch zlib-devel zlib-static texinfo perl-bignum "perl(XML::Simple)" "perl(YAML)" "perl(XML::SAX)" "perl(Fatal)" "perl(Thread::Queue)" "perl(Env)" "perl(XML::LibXML)" "perl(Digest::SHA1)" libxml2-devel libxslt "perl(ExtUtils::MakeMaker)"
 RUN dnf -y install which wget unzip tar cpio python bzip2 bc vim redhat-lsb-core
diff --git a/ci/Dockerfile/fedora27.x86_64 b/ci/Dockerfile/fedora27.x86_64
new file mode 120000
index 0000000..7c4b5e7
--- /dev/null
+++ b/ci/Dockerfile/fedora27.x86_64
@@ -0,0 +1 @@
+fedora27
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1404 b/ci/Dockerfile/ubuntu1404
deleted file mode 100644
index b3833c9..0000000
--- a/ci/Dockerfile/ubuntu1404
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM ubuntu:14.04
-# Don't ask. Ubuntu is awful.
-RUN sed -e 's/main$/main universe/' --in-place=orig /etc/apt/sources.list
-RUN DEBIAN_FRONTEND=noninteractive apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -yy cscope ctags \
-  libz-dev libexpat-dev \
-  python language-pack-en texinfo \
-  build-essential g++ git bison flex unzip \
-  libxml-simple-perl libxml-sax-perl libxml2-dev libxml2-utils xsltproc
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -yy wget bc libssl-dev
diff --git a/ci/Dockerfile/ubuntu1404.ppc64le b/ci/Dockerfile/ubuntu1404.ppc64le
deleted file mode 120000
index 529a5fa..0000000
--- a/ci/Dockerfile/ubuntu1404.ppc64le
+++ /dev/null
@@ -1 +0,0 @@
-ubuntu1404
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1404.x86_64 b/ci/Dockerfile/ubuntu1404.x86_64
deleted file mode 120000
index 529a5fa..0000000
--- a/ci/Dockerfile/ubuntu1404.x86_64
+++ /dev/null
@@ -1 +0,0 @@
-ubuntu1404
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1604 b/ci/Dockerfile/ubuntu1604
new file mode 100644
index 0000000..46f6801
--- /dev/null
+++ b/ci/Dockerfile/ubuntu1604
@@ -0,0 +1,10 @@
+FROM ubuntu:16.04
+# Don't ask. Ubuntu is awful.
+RUN sed -e 's/main$/main universe/' --in-place=orig /etc/apt/sources.list
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yy cscope ctags \
+  libz-dev libexpat-dev \
+  python language-pack-en texinfo \
+  build-essential g++ git bison flex unzip \
+  cpio vim-common lsb-release \
+  libxml-simple-perl libxml-sax-perl libxml2-dev libxml2-utils xsltproc \
+  wget bc libssl-dev
diff --git a/ci/Dockerfile/ubuntu1604.ppc64le b/ci/Dockerfile/ubuntu1604.ppc64le
new file mode 120000
index 0000000..174b820
--- /dev/null
+++ b/ci/Dockerfile/ubuntu1604.ppc64le
@@ -0,0 +1 @@
+ubuntu1604
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1604.x86_64 b/ci/Dockerfile/ubuntu1604.x86_64
new file mode 120000
index 0000000..174b820
--- /dev/null
+++ b/ci/Dockerfile/ubuntu1604.x86_64
@@ -0,0 +1 @@
+ubuntu1604
\ No newline at end of file
diff --git a/ci/build.sh b/ci/build.sh
index 0ace0e1..4e45262 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CONTAINERS="ubuntu1404 fedora25"
+CONTAINERS="ubuntu1604 fedora27"
 
 while getopts ":ahp:c:" opt; do
   case $opt in
@@ -64,21 +64,27 @@
 	fi
 	if [[ -n "$HTTP_PROXY" ]]; then
 		http_proxy=$HTTP_PROXY
+		HTTP_PROXY_ENV="ENV http_proxy $HTTP_PROXY"
+	fi
+	if [[ -n "$HTTPS_PROXY" ]]; then
+		https_proxy=$HTTPS_PROXY
+		HTTPS_PROXY_ENV="ENV https_proxy $HTTPS_PROXY"
 	fi
 	if [[ -n "$http_proxy" ]]; then
-	  if [[ "$distro" == fedora25 ]]; then
+	  if [[ "$distro" == fedora27 ]]; then
 	    PROXY="RUN echo \"proxy=${http_proxy}\" >> /etc/dnf/dnf.conf"
 	  fi
-	  if [[ "$distro" == ubuntu1404 ]]; then
+	  if [[ "$distro" == ubuntu1604 ]]; then
 	    PROXY="RUN echo \"Acquire::http::Proxy \\"\"${http_proxy}/\\"\";\" > /etc/apt/apt.conf.d/000apt-cacher-ng-proxy"
 	  fi
         fi
 
 	Dockerfile=$(head -n1 $base_dockerfile; echo ${PROXY}; tail -n +2 $base_dockerfile; cat << EOF
-RUN groupadd -g ${GROUPS} ${USER} && useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
 ${PROXY}
-USER ${USER}
+RUN useradd -d ${HOME} -m -u ${UID} ${USER}
 ENV HOME ${HOME}
+${HTTP_PROXY_ENV}
+${HTTPS_PROXY_ENV}
 EOF
 )
 	$DOCKER_PREFIX docker build -t openpower/op-build-$distro - <<< "${Dockerfile}"
diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk
index a1af1a8..a497c94 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 OCC_VERSION_BRANCH_MASTER_P8 ?= 28f2cec690b7f19548ce860a8820f519e6c39a6a
-OCC_VERSION_BRANCH_MASTER ?= 577915f28604090d3b9a16e7a5a109d3afff87f9
+OCC_VERSION_BRANCH_MASTER ?= f72f857b7e5ab25a5616b1655005b963405eb350
 
 OCC_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_VERSION_BRANCH_MASTER),$(OCC_VERSION_BRANCH_MASTER_P8))
 OCC_SITE ?= $(call github,open-power,occ,$(OCC_VERSION))