diff --git a/cluster/addons/cluster-monitoring/heapster-controller.yaml b/cluster/addons/cluster-monitoring/heapster-controller.yaml
index d448d5b49a2..4c1f3735644 100644
--- a/cluster/addons/cluster-monitoring/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/heapster-controller.yaml
@@ -12,7 +12,7 @@ desiredState:
         id: monitoring-heapster
         containers:
           - name: heapster
-            image: kubernetes/heapster:v0.9
+            image: gcr.io/google-containers/heapster:v0.9
             env: 
               - name: "INFLUXDB_HOST"
                 value: "monitoring-influxdb"
diff --git a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
index 3e5c2fac410..dd80b4dcf25 100644
--- a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
@@ -15,14 +15,14 @@ desiredState:
         id: monitoring-influx-grafana
         containers: 
           - name: influxdb
-            image: kubernetes/heapster_influxdb:v0.3
+            image: gcr.io/google-containers/heapster_influxdb:v0.3
             ports: 
               - containerPort: 8083
                 hostPort: 8083
               - containerPort: 8086
                 hostPort: 8086
           - name: grafana
-            image: kubernetes/heapster_grafana:v0.5
+            image: gcr.io/google-containers/heapster_grafana:v0.5
             env: 
               - name: "HTTP_USER"
                 value: "admin"
diff --git a/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml b/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
index 6d73e95083e..fa7b3267e88 100644
--- a/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
@@ -16,7 +16,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 
-        - image: kubernetes/heapster:v0.9
+        - image: gcr.io/google-containers/heapster:v0.9
           name: heapster
           env: 
             - name: "INFLUXDB_HOST"
diff --git a/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
index 55a2d651757..212122d72bd 100644
--- a/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
@@ -16,7 +16,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 
-        - image: kubernetes/heapster_influxdb:v0.3
+        - image: gcr.io/google-containers/heapster_influxdb:v0.3
           name: influxdb
           ports: 
             - containerPort: 8083
@@ -24,7 +24,7 @@ spec:
             - containerPort: 8086
               hostPort: 8086
         - name: grafana
-          image: kubernetes/heapster_grafana:v0.5
+          image: gcr.io/google-containers/heapster_grafana:v0.5
           ports:
               - containerPort: 80
           env: 
diff --git a/cluster/addons/dns/skydns-rc.yaml.in b/cluster/addons/dns/skydns-rc.yaml.in
index 839b308abfe..de6e5a7c324 100644
--- a/cluster/addons/dns/skydns-rc.yaml.in
+++ b/cluster/addons/dns/skydns-rc.yaml.in
@@ -29,13 +29,13 @@ desiredState:
                     "-advertise-client-urls=http://127.0.0.1:4001",
             ]
           - name: kube2sky
-            image: kubernetes/kube2sky:1.1
+            image: gcr.io/google-containers/kube2sky:1.1
             command: [
                     # entrypoint = "/kube2sky",
                     "-domain={{ pillar['dns_domain'] }}",
             ]
           - name: skydns
-            image: kubernetes/skydns:2015-03-11-001
+            image: gcr.io/google-containers/skydns:2015-03-11-001
             command: [
                     # entrypoint = "/skydns",
                     "-machines=http://localhost:4001",
diff --git a/cluster/addons/fluentd-elasticsearch/es-controller.yaml.in b/cluster/addons/fluentd-elasticsearch/es-controller.yaml.in
index af3ba63674b..2551c0f9d74 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: kubernetes/elasticsearch:1.0
+            image: gcr.io/google-containers/elasticsearch:1.0
             ports:
               - name: es-port
                 containerPort: 9200
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
index 229fd35970b..4910ff00a16 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: kubernetes/kibana:1.1
+            image: gcr.io/google-containers/kibana:1.1
             ports:
               - name: kibana-port
                 containerPort: 80
@@ -21,4 +21,4 @@ desiredState:
       kubernetes.io/cluster-service: "true"
 labels:
   name: kibana-logging
-  kubernetes.io/cluster-service: "true"
\ No newline at end of file
+  kubernetes.io/cluster-service: "true"