diff --git a/WORKSPACE b/WORKSPACE
index 871d713..de54a37 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -496,12 +496,12 @@
 # end Pulsar Client
 
 # java cc
-new_http_archive(
-  name = "javacc",
-  url = "https://javacc.org/downloads/javacc-5.0.tar.gz",
-  strip_prefix = "javacc-5.0",
-  build_file = "third_party/java/javacc/javacc.BUILD",
-)
+# new_http_archive(
+#   name = "javacc",
+#   url = "https://javacc.org/downloads/javacc-5.0.tar.gz",
+#   strip_prefix = "javacc-5.0",
+#   build_file = "third_party/java/javacc/javacc.BUILD",
+# )
 # end java cc
 
 # Kubernetes java client
diff --git a/docker/compile/Dockerfile.ubuntu15.10 b/docker/compile/Dockerfile.ubuntu15.10
deleted file mode 100644
index 58ea71a..0000000
--- a/docker/compile/Dockerfile.ubuntu15.10
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM ubuntu:15.10
-
-# This is passed to the heron build command via the --config flag
-ENV TARGET_PLATFORM ubuntu
-ENV bazelVersion 0.9.0
-
-RUN apt-get update && apt-get -y install \
-      automake \
-      build-essential \
-      cmake \
-      curl \
-      libssl-dev \
-      git \
-      libtool \
-      libtool-bin \
-      python \
-      python2.7-dev \
-      python-software-properties \
-      software-properties-common \
-      python-setuptools \
-      zip \
-      unzip \
-      wget
-
-RUN apt-get -y install openjdk-8-jdk
-
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
-
-RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \
-      && chmod +x /tmp/bazel.sh \
-      && /tmp/bazel.sh
-
-ADD bazelrc /root/.bazelrc
-ADD scripts/compile-platform.sh /compile-platform.sh
diff --git a/docker/dist/Dockerfile.dist.ubuntu15.10 b/docker/dist/Dockerfile.dist.ubuntu15.10
deleted file mode 100644
index f9ffbfb..0000000
--- a/docker/dist/Dockerfile.dist.ubuntu15.10
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update
-RUN apt-get -y install python ; apt-get clean all
-RUN apt-get -y install unzip ; apt-get clean all
-RUN apt-get -y install software-properties-common ; apt-get clean all
-RUN apt-get -y install curl ; apt-get clean all
-RUN apt-get -y install supervisor; apt-get clean all
-
-RUN apt-get -y install openjdk-8-jdk; apt-get clean all
-
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
-RUN update-ca-certificates -f
-
-ADD artifacts /heron
-
-WORKDIR /heron
-
-# run heron installers
-RUN /heron/heron-client-install.sh
-RUN /heron/heron-tools-install.sh
-
-RUN tar --strip-components=1 -m -zxvf /heron/heron-core.tar.gz -C /heron
-
-RUN rm -f /heron/heron-tools-install.sh
-RUN rm -f /heron/heron-client-install.sh
-RUN rm -f /heron/heron-core.tar.gz
-
-ENV HERON_HOME /heron/heron-core/
-RUN export HERON_HOME
diff --git a/third_party/java/BUILD b/third_party/java/BUILD
index 1471844..6d82bb6 100644
--- a/third_party/java/BUILD
+++ b/third_party/java/BUILD
@@ -4,7 +4,7 @@
 
 filegroup(
     name = "javacc",
-    srcs = ["@javacc//:javacc"],
+    srcs = ["//third_party/java/javacc:javacc"],
 )
 
 java_library(
diff --git a/third_party/java/javacc/BUILD b/third_party/java/javacc/BUILD
new file mode 100644
index 0000000..d341cdf
--- /dev/null
+++ b/third_party/java/javacc/BUILD
@@ -0,0 +1,46 @@
+licenses(["notice"])
+  
+package(default_visibility = ["//visibility:public"])
+
+pkg_name = "javacc"
+pkg_version = "5.0"
+
+package_file = pkg_name + "-" + pkg_version + ".tar.gz"
+package_dir = pkg_name + "-" + pkg_version
+
+out_files = [
+    "bin/lib/javacc.jar",
+    "bin/jjtree.bat",
+    "bin/jjrun",
+    "bin/javacc",
+    "bin/javacc.bat",
+    "bin/jjdoc.bat",
+    "bin/jjtree",
+    "bin/jjdoc",
+]
+
+genrule(
+    name = "javacc-srcs",
+    srcs = [
+        package_file, 
+    ],
+    outs = out_files,
+    cmd = "\n".join([
+        'export INSTALL_DIR=$$(pwd)/$(@D)',
+        'export TMP_DIR=$$(mktemp -d -t libevent.XXXXX)',
+        'mkdir -p $$TMP_DIR',
+        'cp -R $(SRCS) $$TMP_DIR',
+        'cd $$TMP_DIR',
+        'tar xfz ' + package_file,
+        'cd ' + package_dir,
+        'cp -r . $$INSTALL_DIR',
+        'rm -rf $$TMP_DIR',
+    ]),
+)
+
+filegroup(
+    name = "javacc",
+    srcs = [
+        "bin/javacc",
+    ],
+)
diff --git a/third_party/java/javacc/javacc-5.0.tar.gz b/third_party/java/javacc/javacc-5.0.tar.gz
new file mode 100644
index 0000000..4cc8557
--- /dev/null
+++ b/third_party/java/javacc/javacc-5.0.tar.gz
Binary files differ