diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..c4a72a4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "vendor/k8s.io/client-go"]
+	path = vendor/k8s.io/client-go
+	url = https://github.com/kubernetes/client-go
+[submodule "vendor/k8s.io/apimachinery"]
+	path = vendor/k8s.io/apimachinery
+	url = https://github.com/kubernetes/apimachinery.git
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..457137f
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,4 @@
+FROM golang:1.8
+COPY . /go/src/github.com/m-lab/gcp-service-discovery
+RUN go get -v github.com/m-lab/gcp-service-discovery/cmd/gcp_service_discovery
+ENTRYPOINT ["/go/bin/gcp_service_discovery"]
diff --git a/cmd/gcp_service_discovery/Dockerfile b/cmd/gcp_service_discovery/Dockerfile
deleted file mode 100644
index 663d216..0000000
--- a/cmd/gcp_service_discovery/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM golang:1.8
-COPY . /go/src/gcp_service_discovery
-RUN go get -v gcp_service_discovery
-ENTRYPOINT ["/go/bin/gcp_service_discovery"]
diff --git a/vendor/k8s.io/apimachinery b/vendor/k8s.io/apimachinery
new file mode 160000
index 0000000..84c15da
--- /dev/null
+++ b/vendor/k8s.io/apimachinery
@@ -0,0 +1 @@
+Subproject commit 84c15da65eb86243c295d566203d7689cc6ac04b
diff --git a/vendor/k8s.io/client-go b/vendor/k8s.io/client-go
new file mode 160000
index 0000000..22eca11
--- /dev/null
+++ b/vendor/k8s.io/client-go
@@ -0,0 +1 @@
+Subproject commit 22eca115bd15e23ca5e645fbf68e30a8738a23de