diff --git a/cluster/addons/fluentd-elasticsearch/es-controller.yaml.in b/cluster/addons/fluentd-elasticsearch/es-controller.yaml.in
index 2551c0f9d74fd..46abd90c25e64 100644
--- a/cluster/addons/fluentd-elasticsearch/es-controller.yaml.in
+++ b/cluster/addons/fluentd-elasticsearch/es-controller.yaml.in
@@ -12,7 +12,7 @@ desiredState:
         id: es-log-ingestion
         containers:
           - name: elasticsearch-logging
-            image: gcr.io/google-containers/elasticsearch:1.0
+            image: gcr.io/google_containers/elasticsearch:1.0
             ports:
               - name: es-port
                 containerPort: 9200
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
index 464c075fe3501..49050b0241977 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -4,7 +4,7 @@ IMAGE = fluentd-elasticsearch
 TAG = 1.3
 
 build:	
-	docker build -t gcr.io/google-containers/$(IMAGE):$(TAG) .
+	docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
 
 push:	
-	gcloud preview docker push gcr.io/google-containers/$(IMAGE):$(TAG)
+	gcloud preview docker push gcr.io/google_containers/$(IMAGE):$(TAG)
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
index 4910ff00a16c5..315df7a06d9cd 100644
--- a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
+++ b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
@@ -12,7 +12,7 @@ desiredState:
         id: kibana-viewer
         containers:
           - name: kibana-logging
-            image: gcr.io/google-containers/kibana:1.1
+            image: gcr.io/google_containers/kibana:1.1
             ports:
               - name: kibana-port
                 containerPort: 80
diff --git a/cluster/saltbase/salt/fluentd-es/fluentd-es.manifest b/cluster/saltbase/salt/fluentd-es/fluentd-es.manifest
index 39d86b2b5bde8..a1b2c23e9e506 100644
--- a/cluster/saltbase/salt/fluentd-es/fluentd-es.manifest
+++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.manifest
@@ -2,7 +2,7 @@ version: v1beta2
 id: fluentd-to-elasticsearch
 containers:
   - name: fluentd-es
-    image: gcr.io/google-containers/fluentd-elasticsearch:1.3
+    image: gcr.io/google_containers/fluentd-elasticsearch:1.3
     env:
       - name: FLUENTD_ARGS
         value: -qq
diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest
index 2acb91385b01c..371174bad5ab6 100644
--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest
@@ -1,8 +1,8 @@
 version: v1beta2
 id: fluentd-to-gcp
 containers:
-  - name: fluentd-gcp-container
-    image: gcr.io/google-containers/fluentd-gcp:1.2
+  - name: fluentd-gcp
+    image: gcr.io/google_containers/fluentd-gcp:1.2
     volumeMounts:
       - name: containers
         mountPath: /var/lib/docker/containers
diff --git a/contrib/logging/fluentd-gcp-image/Makefile b/contrib/logging/fluentd-gcp-image/Makefile
index 10bde7d7abc1e..9cf8a0b158938 100644
--- a/contrib/logging/fluentd-gcp-image/Makefile
+++ b/contrib/logging/fluentd-gcp-image/Makefile
@@ -9,8 +9,8 @@
 TAG = 1.2
 
 build:	
-	docker build -t gcr.io/google-containers/fluentd-gcp:$(TAG) .
+	docker build -t gcr.io/google_containers/fluentd-gcp:$(TAG) .
 
 push:	
-	gcloud preview docker push gcr.io/google-containers/fluentd-gcp:$(TAG)
+	gcloud preview docker push gcr.io/google_containers/fluentd-gcp:$(TAG)