diff --git a/pkg/docker/Dockerfile b/pkg/docker/Dockerfile
deleted file mode 100644
index 7578ed79..00000000
--- a/pkg/docker/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM ubuntu:xenial
-
-ARG version=0.0.10-1
-ADD https://storage.googleapis.com/stackdriver-container-alpha/deb/xenial/stackdriver-metadata_${version}.xenial.deb /stackdriver-metadata_${version}.xenial.deb
-RUN apt-get update \
-    && (dpkg -i /stackdriver-metadata_${version}.xenial.deb || true) \
-    && apt-get install -f -y \
-    && rm -rf /var/lib/apt/lists/*
-
-CMD /opt/stackdriver/metadata/sbin/metadatad
-
-EXPOSE 8000
diff --git a/pkg/docker/Dockerfile b/pkg/docker/Dockerfile
new file mode 120000
index 00000000..e38faa1c
--- /dev/null
+++ b/pkg/docker/Dockerfile
@@ -0,0 +1 @@
+Dockerfile-xenial
\ No newline at end of file
diff --git a/pkg/docker/Dockerfile-trusty b/pkg/docker/Dockerfile-trusty
new file mode 100644
index 00000000..15937e0e
--- /dev/null
+++ b/pkg/docker/Dockerfile-trusty
@@ -0,0 +1,14 @@
+# To use directly, run: docker build --build-arg package=<pkg>.trusty.deb -t <tag> -f Dockerfile-trusty
+FROM ubuntu:trusty
+
+ARG package
+ADD ${package} /stackdriver-metadata.deb
+RUN apt-get update \
+    && (dpkg -i /stackdriver-metadata.deb || true) \
+    && apt-get install -f -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /stackdriver-metadata.deb
+
+CMD /opt/stackdriver/metadata/sbin/metadatad
+
+EXPOSE 8000
diff --git a/pkg/docker/Dockerfile-xenial b/pkg/docker/Dockerfile-xenial
new file mode 100644
index 00000000..200e5501
--- /dev/null
+++ b/pkg/docker/Dockerfile-xenial
@@ -0,0 +1,15 @@
+# To use directly, run: docker build --build-arg package=<pkg>.xenial.deb -t <tag> -f Dockerfile-xenial
+FROM ubuntu:xenial
+
+ARG version=0.0.13-1
+ARG package=https://storage.googleapis.com/stackdriver-container-alpha/deb/xenial/stackdriver-metadata_${version}.xenial.deb
+ADD ${package} /stackdriver-metadata.deb
+RUN apt-get update \
+    && (dpkg -i /stackdriver-metadata.deb || true) \
+    && apt-get install -f -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /stackdriver-metadata.deb
+
+CMD /opt/stackdriver/metadata/sbin/metadatad
+
+EXPOSE 8000
diff --git a/src/Makefile b/src/Makefile
index 9c06bbe1..45ec06e7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -67,13 +67,17 @@ PKG_VERSION=0.0.13
 PKG_RELEASE=1
 PKG_MAINTAINER=Stackdriver Engineering <engineering@stackdriver.com>
 
+DOCKER_VERSION=0.2
+DOCKER_IMAGE=us.gcr.io/container-monitoring-storage/stackdriver-metadata-agent
+DOCKER_TAG=$(DOCKER_VERSION)-$(PKG_VERSION)-$(PKG_RELEASE)
+
 PKG_TMPDIR=$$(mktemp -d --tmpdir metadata-build.XXXXXXXXXX)
 
 DEB_PKG=$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)$(if $(DISTRO),.$(DISTRO),).deb
 RPM_PKG=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)$(if $(DISTRO),.$(DISTRO),).x86_64.rpm
 
 $(DEB_PKG): metadatad $(wildcard ../pkg/deb/debian/*) Makefile
-	export TMPDIR=$(PKG_TMPDIR) && \
+	TMPDIR=$(PKG_TMPDIR) && export TMPDIR && \
 	export DEB_DIR=$$TMPDIR/deb && \
 	mkdir -p $$DEB_DIR/package && \
 	$(MAKE) DESTDIR=$$DEB_DIR/package install && \
@@ -94,7 +98,7 @@ $(DEB_PKG): metadatad $(wildcard ../pkg/deb/debian/*) Makefile
 deb: $(DEB_PKG)
 
 $(RPM_PKG): metadatad $(wildcard ../pkg/rpm/*) Makefile
-	export TMPDIR=$(PKG_TMPDIR) && \
+	TMPDIR=$(PKG_TMPDIR) && export TMPDIR && \
 	export RPM_DIR=$$TMPDIR/rpm && \
 	mkdir -p $$RPM_DIR/package && \
 	$(MAKE) DESTDIR=$$RPM_DIR/package install && \
@@ -103,6 +107,15 @@ $(RPM_PKG): metadatad $(wildcard ../pkg/rpm/*) Makefile
 
 rpm: $(RPM_PKG)
 
+docker: $(DEB_PKG) ../pkg/docker/Dockerfile-$(DISTRO)
+	TMPDIR=$(PKG_TMPDIR) && export TMPDIR && \
+	export DOCKER_DIR=$$TMPDIR/docker && \
+	mkdir -p $$DOCKER_DIR && \
+	cp ../pkg/docker/Dockerfile-$(DISTRO) $$DOCKER_DIR/Dockerfile && \
+	cp $(DEB_PKG) $$DOCKER_DIR/ && \
+	docker build --build-arg package="$(DEB_PKG)" -t $(DOCKER_IMAGE):$(DOCKER_TAG) $$DOCKER_DIR && \
+	$(RM) -r $$TMPDIR
+
 clean:
 	$(RM) metadatad $(OBJS)