diff --git a/Makefile b/Makefile
index 2d9f5fa7..7c82060e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ CONFLUENT_VERSION ?= ${CONFLUENT_MAJOR_VERSION}.${CONFLUENT_MINOR_VERSION}.${CON
 
 KAFKA_VERSION ?= 1.1.0
 
-COMPONENTS := base zookeeper kafka kafka-rest schema-registry kafka-connect-base kafka-connect enterprise-control-center kafkacat enterprise-replicator enterprise-kafka
+COMPONENTS := base zookeeper kafka kafka-rest schema-registry kafka-connect-base kafka-connect # enterprise-control-center kafkacat enterprise-replicator enterprise-kafka
 COMMIT_ID := $(shell git rev-parse --short HEAD)
 MYSQL_DRIVER_VERSION := 5.1.39
 
@@ -90,7 +90,8 @@ endif
         docker tag $${image} ${DOCKER_REMOTE_REPOSITORY}/$${image#*/}; \
   done
 
-push-private: clean build-debian build-test-images tag-remote
+#push-private: clean build-debian build-test-images tag-remote
+push-private: clean build-debian tag-remote
 ifndef DOCKER_REMOTE_REPOSITORY
 	$(error DOCKER_REMOTE_REPOSITORY must be defined.)
 endif
@@ -108,7 +109,7 @@ push-public: clean build-debian
   done
 
 clean: clean-containers clean-images
-	rm -rf debian/base/include/etc/confluent/docker/docker-utils.jar
+	#rm -rf debian/base/include/etc/confluent/docker/docker-utils.jar
 
 venv: venv/bin/activate
 venv/bin/activate: tests/requirements.txt
diff --git a/bin/build-debian b/bin/build-debian
index b4413b1a..56ff6ae3 100755
--- a/bin/build-debian
+++ b/bin/build-debian
@@ -10,7 +10,8 @@ for component in ${COMPONENTS} ; do
         BUILD_ARGS=""
     fi
 
-    for type in "" rpm; do
+    #for type in "" rpm; do
+    for type in ""; do
         DOCKER_FILE="debian/${component}/Dockerfile"
         COMPONENT_NAME=${component}
 
diff --git a/debian/base/Dockerfile b/debian/base/Dockerfile
index ad5977f5..03dc83ad 100644
--- a/debian/base/Dockerfile
+++ b/debian/base/Dockerfile
@@ -78,14 +78,22 @@ RUN echo "===> Updating debian ....." \
     && pip install --no-cache-dir --upgrade pip==${PYTHON_PIP_VERSION} \
     && pip install --no-cache-dir git+https://github.com/confluentinc/confluent-docker-utils@v0.0.20 \
     && apt remove --purge -y git \
-    && echo "Installing Zulu OpenJDK ${ZULU_OPENJDK_VERSION}" \
-    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 \
-    && echo "deb http://repos.azulsystems.com/debian stable  main" >> /etc/apt/sources.list.d/zulu.list \
-    && apt-get -qq update \
-    && apt-get -y install zulu-${ZULU_OPENJDK_VERSION} \
-    && echo "===> Installing Kerberos Patch ..." \
-    && DEBIAN_FRONTEND=noninteractive apt-get -y install krb5-user \
-    && rm -rf /var/lib/apt/lists/* \
+    \
+    && echo "===> Adding webupd8 repository for Oracle JDK..."  \
+    && echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list \
+    && echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list \
+    && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EEA14886 \
+    && apt-get update \
+    && echo "===> Installing Oracle JDK 8 ..."   \
+    && echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections \
+    && echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections \
+    && DEBIAN_FRONTEND=noninteractive  apt-get install -y --force-yes \
+                    oracle-java8-installer \
+                    oracle-java8-set-default  \
+                    ca-certificates \
+    && rm -rf /var/cache/oracle-jdk8-installer \
+    && apt-get clean && rm -rf /tmp/* /var/lib/apt/lists/* \
+    \
     && echo "===> Adding confluent repository...${CONFLUENT_PACKAGES_REPO}/deb/${CONFLUENT_MAJOR_VERSION}.${CONFLUENT_MINOR_VERSION}" \
     && if [ "x$ALLOW_UNSIGNED" = "xtrue" ]; then echo "APT::Get::AllowUnauthenticated \"true\";" > /etc/apt/apt.conf.d/allow_unauthenticated; else curl -L ${CONFLUENT_PACKAGES_REPO}/deb/${CONFLUENT_MAJOR_VERSION}.${CONFLUENT_MINOR_VERSION}/archive.key | apt-key add - ; fi \
     && echo "deb [arch=amd64] ${CONFLUENT_PACKAGES_REPO}/deb/${CONFLUENT_MAJOR_VERSION}.${CONFLUENT_MINOR_VERSION} stable main" >> /etc/apt/sources.list
diff --git a/debian/base/include/etc/confluent/docker/docker-utils.jar b/debian/base/include/etc/confluent/docker/docker-utils.jar
new file mode 100644
index 00000000..c73ffa4e
Binary files /dev/null and b/debian/base/include/etc/confluent/docker/docker-utils.jar differ