diff --git a/WORKSPACE b/WORKSPACE
index 209284bc8..92b8fc1d5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -172,6 +172,14 @@ new_http_archive(
     url = "https://codeload.github.com/tianon/docker-brew-ubuntu-core/zip/b6f1fe19228e5b6b7aed98dcba02f18088282f90",
 )
 
+# See github.com/istio/manager/blob/master/docker/debug/build-and-publish-debug-image.sh
+# for instructions on how to re-build and publish this base image layer.
+http_file(
+    name = "ubuntu_xenial_debug",
+    url = "https://storage.googleapis.com/istio-build/manager/ubuntu_xenial_debug.tar.gz",
+    sha256 = "02f0ea4b04012562dec4b75ee4337ac77a0003418d02a91bde1b4b4d162a41e4",
+)
+
 new_go_repository(
     name = "com_github_prometheus_client_golang",
     commit = "c5b7fccd204277076155f10851dad72b76a49317", # Aug 17, 2016 (v0.8.0)
diff --git a/docker/BUILD b/docker/BUILD
index 1a212bd7d..25399dfe4 100644
--- a/docker/BUILD
+++ b/docker/BUILD
@@ -1,5 +1,5 @@
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
-load("@bazel_tools//tools/build_defs/docker:docker.bzl", "docker_build")
+load("//docker:mixer_docker.bzl", "mixer_docker_build")
 
 # Use "manual" target tag to skip rules in the wildcard expansion
 
@@ -14,9 +14,11 @@ pkg_tar(
     tags = ["manual"],
 )
 
-docker_build(
-    name = "mixer",
-    base = "@docker_ubuntu//:xenial",
+mixer_docker_build(
+    images = [
+        {"name": "mixer",       "base": "@docker_ubuntu//:xenial"},
+        {"name": "mixer_debug", "base": "@ubuntu_xenial_debug//file"},
+    ],
     entrypoint = [
         "/usr/local/bin/mixs",
         "server",
diff --git a/docker/mixer_docker.bzl b/docker/mixer_docker.bzl
new file mode 100644
index 000000000..07217bb1e
--- /dev/null
+++ b/docker/mixer_docker.bzl
@@ -0,0 +1,9 @@
+load("@bazel_tools//tools/build_defs/docker:docker.bzl", "docker_build")
+
+def mixer_docker_build(images, **kwargs):
+    for image in images:
+        docker_build(
+            name = image['name'],
+            base = image['base'],
+            **kwargs
+        )