diff --git a/endpoints/getting-started/Dockerfile.custom b/endpoints/getting-started/Dockerfile.custom
index 3c9f9fe70ce..6dc65ab419e 100644
--- a/endpoints/getting-started/Dockerfile.custom
+++ b/endpoints/getting-started/Dockerfile.custom
@@ -1,8 +1,13 @@
+# The Google App Engine Flexible Environment base Docker image can
+# also be used on Google Container Engine, or any other Docker host.
+# This image is based on Debian Jessie and includes nodejs and npm
+# installed from nodejs.org. The source is located in
+# https://github.com/GoogleCloudPlatform/nodejs-docker
 FROM gcr.io/google_appengine/nodejs
 
 ADD . /app
 WORKDIR /app
 
 RUN npm install
-ENV PORT=8081
+ENV PORT=8080
 ENTRYPOINT ["npm", "start"]
diff --git a/endpoints/getting-started/container-engine.yaml b/endpoints/getting-started/container-engine.yaml
index 6d07c370134..6764b299c1c 100644
--- a/endpoints/getting-started/container-engine.yaml
+++ b/endpoints/getting-started/container-engine.yaml
@@ -19,7 +19,7 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 8080
+    targetPort: 8081
     protocol: TCP
     name: http
   selector:
@@ -42,15 +42,15 @@ spec:
       - name: esp
         image: b.gcr.io/endpoints/endpoints-runtime:0.3
         args: [
-          "-p", "8080",
-          "-a", "127.0.0.1:8081",
+          "-p", "8081",
+          "-a", "127.0.0.1:8080",
           "-s", "SERVICE_NAME",
           "-v", "SERVICE_VERSION",
         ]
       # [END esp]
         ports:
-          - containerPort: 8080
+          - containerPort: 8081
       - name: echo
-        image: gcr.io/google-samples/node-echo:1.0
+        image: gcr.io/google-samples/echo-node:1.0
         ports:
-          - containerPort: 8081
+          - containerPort: 8080