diff --git a/cluster/addons/fluentd-elasticsearch/es-service.yaml b/cluster/addons/fluentd-elasticsearch/es-service.yaml
index 3fd9d2c21f680..d3c9ef7a18bb4 100644
--- a/cluster/addons/fluentd-elasticsearch/es-service.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-service.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1beta1
 kind: Service
 id: elasticsearch-logging
-containerPort: es-port
 port: 9200
+containerPort: 9200
 labels:
   name: elasticsearch-logging
   kubernetes.io/cluster-service: "true"
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-service.yaml b/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
index 1af5df263eda1..dd1442b1aed35 100644
--- a/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
+++ b/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1beta1
 kind: Service
 id: kibana-logging
-containerPort: kibana-port
+containerPort: 80
 port: 5601
 labels:
   name: kibana-logging
diff --git a/cluster/addons/fluentd-elasticsearch/logging-demo/README.md b/cluster/addons/fluentd-elasticsearch/logging-demo/README.md
index 96c2ef66601ad..4089ba5cd5188 100644
--- a/cluster/addons/fluentd-elasticsearch/logging-demo/README.md
+++ b/cluster/addons/fluentd-elasticsearch/logging-demo/README.md
@@ -111,7 +111,7 @@ Running: ../../../../cluster/gce/../../_output/dockerized/bin/linux/amd64/kubect
     "publicIPs": [
         "104.154.81.135"
     ],
-    "containerPort": "es-port",
+    "containerPort": 9200,
     "portalIP": "10.0.58.62",
     "sessionAffinity": "None"
 }
@@ -139,7 +139,7 @@ Running: ../../../../cluster/gce/../../_output/dockerized/bin/linux/amd64/kubect
     "publicIPs": [
         "104.154.91.224"
     ],
-    "containerPort": "kibana-port",
+    "containerPort": 80,
     "portalIP": "10.0.124.153",
     "sessionAffinity": "None"
 }
diff --git a/contrib/git-sync/demo/config/service.yaml b/contrib/git-sync/demo/config/service.yaml
index 646b4c59aa6c2..3f71fe78c2e1f 100644
--- a/contrib/git-sync/demo/config/service.yaml
+++ b/contrib/git-sync/demo/config/service.yaml
@@ -2,7 +2,7 @@ id: blog-service
 kind: Service
 apiVersion: v1beta1
 port: 80
-containerPort: http-server
+containerPort: 80
 selector:
   name: blog
 createExternalLoadBalancer: true
diff --git a/docs/getting-started-guides/azure.md b/docs/getting-started-guides/azure.md
index 4eb1ef51cdefc..5e267616df308 100644
--- a/docs/getting-started-guides/azure.md
+++ b/docs/getting-started-guides/azure.md
@@ -91,7 +91,7 @@ Where pod.json contains something like:
           "initialDelaySeconds": 30,
           "httpGet": {
             "path": "/index.html",
-            "port": "8080"
+            "port": 8080
           }
         }
       }]
diff --git a/docs/getting-started-guides/gce.md b/docs/getting-started-guides/gce.md
index 1e4c6b5d1a2ce..b4b1cb8f74059 100644
--- a/docs/getting-started-guides/gce.md
+++ b/docs/getting-started-guides/gce.md
@@ -104,7 +104,7 @@ Where pod.json contains something like:
           "initialDelaySeconds": 30,
           "httpGet": {
             "path": "/index.html",
-            "port": "8081"
+            "port": 8081
           }
         }
       }]
diff --git a/examples/openshift-origin/resource-generator.sh b/examples/openshift-origin/resource-generator.sh
index e1b2b77338489..87b80323f388c 100755
--- a/examples/openshift-origin/resource-generator.sh
+++ b/examples/openshift-origin/resource-generator.sh
@@ -173,7 +173,7 @@ cat <<EOF >"${ORIGIN}/api-service.json"
   "kind": "Service",
   "id": "origin-api",
   "port": 8443,
-  "containerPort": "https-api",
+  "containerPort": 8443,
   "selector": { "name": "origin" },
 }
 EOF
@@ -186,7 +186,7 @@ cat <<EOF >"${ORIGIN}/ui-service.json"
   "kind": "Service",
   "id": "origin-ui",
   "port": 8444,
-  "containerPort": "https-ui",
+  "containerPort": 8444,
   "selector": { "name": "origin" },
 }
 EOF
diff --git a/examples/rethinkdb/admin-service.yaml b/examples/rethinkdb/admin-service.yaml
index 215d6fe96744a..4b116d1b71a6d 100644
--- a/examples/rethinkdb/admin-service.yaml
+++ b/examples/rethinkdb/admin-service.yaml
@@ -2,8 +2,8 @@ apiVersion: v1beta1
 namespace: rethinkdb
 kind: Service
 id: rethinkdb-admin
-containerPort: admin-port
 port: 8080
+containerPort: 8080
 labels:
   db: influxdb
 selector:
diff --git a/examples/rethinkdb/driver-service.yaml b/examples/rethinkdb/driver-service.yaml
index c3c0a2f2f6267..ac226760ce953 100644
--- a/examples/rethinkdb/driver-service.yaml
+++ b/examples/rethinkdb/driver-service.yaml
@@ -2,8 +2,8 @@ apiVersion: v1beta1
 namespace: rethinkdb
 kind: Service
 id: rethinkdb-driver
-containerPort: driver-port
 port: 28015
+containerPort: 28015
 labels:
   db: influxdb
 selector: