diff --git a/doc/loadtest/README.md b/doc/loadtest/README.md
index f0079ca..7619811 100644
--- a/doc/loadtest/README.md
+++ b/doc/loadtest/README.md
@@ -192,8 +192,8 @@ Now, let's create the Docker images that we will use to run our services. I am a
 
 ```console
 $ docker build -t gcr.io/google.com/doorman/doorman-server:v0.1.7 doc/loadtest/docker/server/
-$ docker build -t gcr.io/google.com/doorman/doorman-client:v0.1.7 doc/loadtest/docker/server/
-$ docker build -t gcr.io/google.com/doorman/target:v0.1 doc/loadtest/docker/server/
+$ docker build -t gcr.io/google.com/doorman/doorman-client:v0.1.7 doc/loadtest/docker/client/
+$ docker build -t gcr.io/google.com/doorman/target:v0.1 doc/loadtest/docker/target/
 $ docker build -t gcr.io/google.com/doorman/prometheus:v0.2 doc/loadtest/docker/prometheus
 ```
 
diff --git a/doc/loadtest/docker/client/Dockerfile b/doc/loadtest/docker/client/Dockerfile
index 81cd5f5..a95d638 100644
--- a/doc/loadtest/docker/client/Dockerfile
+++ b/doc/loadtest/docker/client/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.5
+FROM golang:1.7
 RUN go get  "github.com/golang/glog" "github.com/pborman/uuid" "github.com/youtube/doorman/go/client/doorman" \
 	golang.org/x/net/context google.golang.org/grpc google.golang.org/grpc/examples/helloworld/helloworld \
 	github.com/youtube/doorman/go/ratelimiter
diff --git a/doc/loadtest/docker/prometheus/prometheus.yml b/doc/loadtest/docker/prometheus/prometheus.yml
index 8b45456..5f5747a 100644
--- a/doc/loadtest/docker/prometheus/prometheus.yml
+++ b/doc/loadtest/docker/prometheus/prometheus.yml
@@ -21,6 +21,7 @@ scrape_configs:
   - api_servers:
     - 'https://kubernetes.default.svc'
     in_cluster: true
+    role: apiserver
 
   relabel_configs:
   - source_labels: [__meta_kubernetes_role]
@@ -49,6 +50,7 @@ scrape_configs:
   - api_servers:
     - 'https://kubernetes.default.svc'
     in_cluster: true
+    role: endpoint
 
   relabel_configs:
   - source_labels: [__meta_kubernetes_role, __meta_kubernetes_service_annotation_prometheus_io_scrape]
@@ -95,6 +97,7 @@ scrape_configs:
   - api_servers:
     - 'https://kubernetes.default.svc'
     in_cluster: true
+    role: service
 
   relabel_configs:
   - source_labels: [__meta_kubernetes_role, __meta_kubernetes_service_annotation_prometheus_io_probe]
diff --git a/doc/loadtest/docker/server/Dockerfile b/doc/loadtest/docker/server/Dockerfile
index bbd7772..da5343c 100644
--- a/doc/loadtest/docker/server/Dockerfile
+++ b/doc/loadtest/docker/server/Dockerfile
@@ -1,3 +1,3 @@
-FROM golang:1.5
+FROM golang:1.7
 ADD config.yml .
 RUN go get github.com/youtube/doorman/go/cmd/doorman
\ No newline at end of file
diff --git a/doc/loadtest/docker/target/Dockerfile b/doc/loadtest/docker/target/Dockerfile
index c29a954..196bcde 100644
--- a/doc/loadtest/docker/target/Dockerfile
+++ b/doc/loadtest/docker/target/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.5
+FROM golang:1.7
 RUN go get github.com/golang/glog github.com/prometheus/client_golang/prometheus \
 	golang.org/x/net/context google.golang.org/grpc \
 	google.golang.org/grpc/examples/helloworld/helloworld