diff --git a/test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml b/test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml.in
similarity index 82%
rename from test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml
rename to test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml.in
index f6edf9d9885..74beacad2e6 100644
--- a/test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml
+++ b/test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml.in
@@ -11,6 +11,6 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: gcr.io/google_containers/nginx-slim:0.8
+        image: {{.NginxSlimNewImage}}
         ports:
         - containerPort: 80
\ No newline at end of file
diff --git a/test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml b/test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml.in
similarity index 81%
rename from test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml
rename to test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml.in
index ac8efafbdb3..b4955f7ec36 100644
--- a/test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml
+++ b/test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml.in
@@ -10,6 +10,6 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: gcr.io/google_containers/nginx-slim:0.8
+        image: {{.NginxSlimNewImage}}
         ports:
         - containerPort: 80
\ No newline at end of file
diff --git a/test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml b/test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml.in
similarity index 81%
rename from test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml
rename to test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml.in
index 28ebbed8dbe..4b81f287e1a 100644
--- a/test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml
+++ b/test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml.in
@@ -10,6 +10,6 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: gcr.io/google_containers/nginx-slim:0.7
+        image: {{.NginxSlimImage}}
         ports:
         - containerPort: 80
\ No newline at end of file
diff --git a/test/e2e/testing-manifests/kubectl/pause-pod.yaml b/test/e2e/testing-manifests/kubectl/pause-pod.yaml.in
similarity index 76%
rename from test/e2e/testing-manifests/kubectl/pause-pod.yaml
rename to test/e2e/testing-manifests/kubectl/pause-pod.yaml.in
index 898c8f706d0..bb33eaeea46 100644
--- a/test/e2e/testing-manifests/kubectl/pause-pod.yaml
+++ b/test/e2e/testing-manifests/kubectl/pause-pod.yaml.in
@@ -7,6 +7,6 @@ metadata:
 spec:
   containers:
   - name: pause
-    image: gcr.io/google-containers/pause:2.0
+    image: {{.PauseImage}}
     ports:
     - containerPort: 80
diff --git a/test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml b/test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml.in
similarity index 83%
rename from test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml
rename to test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml.in
index e4a595d14a1..7e7b355f6b5 100644
--- a/test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml
+++ b/test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml.in
@@ -7,7 +7,7 @@ metadata:
 spec:
   containers:
   - name: nginx
-    image: gcr.io/google_containers/nginx-slim:0.7
+    image: {{.NginxSlimImage}}
     ports:
     - containerPort: 80
     readinessProbe:
diff --git a/test/e2e/testing-manifests/kubectl/redis-master-controller.json b/test/e2e/testing-manifests/kubectl/redis-master-controller.json.in
similarity index 94%
rename from test/e2e/testing-manifests/kubectl/redis-master-controller.json
rename to test/e2e/testing-manifests/kubectl/redis-master-controller.json.in
index 0d327596649..bce42f05ffa 100644
--- a/test/e2e/testing-manifests/kubectl/redis-master-controller.json
+++ b/test/e2e/testing-manifests/kubectl/redis-master-controller.json.in
@@ -25,7 +25,7 @@
             "containers":[
                {
                   "name":"redis-master",
-		  "image": "gcr.io/k8s-testimages/redis:e2e",
+                  "image": "{{.RedisImage}}",
                   "ports":[
                      {
                         "name":"redis-server",
diff --git a/test/fixtures/doc-yaml/user-guide/update-demo/kitten-rc.yaml b/test/fixtures/doc-yaml/user-guide/update-demo/kitten-rc.yaml.in
similarity index 85%
rename from test/fixtures/doc-yaml/user-guide/update-demo/kitten-rc.yaml
rename to test/fixtures/doc-yaml/user-guide/update-demo/kitten-rc.yaml.in
index 91f1aa06c30..f6703da2d14 100644
--- a/test/fixtures/doc-yaml/user-guide/update-demo/kitten-rc.yaml
+++ b/test/fixtures/doc-yaml/user-guide/update-demo/kitten-rc.yaml.in
@@ -13,7 +13,7 @@ spec:
         version: kitten
     spec:
       containers:
-      - image: gcr.io/google_containers/update-demo:kitten
+      - image: {{.KittenImage}}
         name: update-demo
         ports:
         - containerPort: 80
diff --git a/test/fixtures/doc-yaml/user-guide/update-demo/nautilus-rc.yaml b/test/fixtures/doc-yaml/user-guide/update-demo/nautilus-rc.yaml.in
similarity index 85%
rename from test/fixtures/doc-yaml/user-guide/update-demo/nautilus-rc.yaml
rename to test/fixtures/doc-yaml/user-guide/update-demo/nautilus-rc.yaml.in
index cae1a22c168..b1c8a456c69 100644
--- a/test/fixtures/doc-yaml/user-guide/update-demo/nautilus-rc.yaml
+++ b/test/fixtures/doc-yaml/user-guide/update-demo/nautilus-rc.yaml.in
@@ -14,7 +14,7 @@ spec:
         version: nautilus
     spec:
       containers:
-      - image: gcr.io/google_containers/update-demo:nautilus
+      - image: {{.NautilusImage}}
         name: update-demo
         ports:
         - containerPort: 80