diff --git a/endpoints/getting-started/k8s/esp_echo_http.yaml b/endpoints/getting-started/k8s/esp_echo_http.yaml
index e9f428760a..57c63da888 100644
--- a/endpoints/getting-started/k8s/esp_echo_http.yaml
+++ b/endpoints/getting-started/k8s/esp_echo_http.yaml
@@ -38,12 +38,15 @@ spec:
       labels:
         app: esp-echo
     spec:
+      # [START endpoints_secret1_yaml_go]
       # [START endpoints_secret_1]
       volumes:
         - name: service-account-creds
           secret:
             secretName: service-account-creds
       # [END endpoints_secret_1]
+      # [END endpoints_secret1_yaml_go]
+      # [START endpoints_service_yaml_go]
       # [START endpoints_service]
       containers:
         - name: esp
@@ -56,14 +59,17 @@ spec:
             "--service_account_key", "/etc/nginx/creds/service-account-creds.json",
           ]
       # [END endpoints_service]
+      # [END endpoints_service_yaml_go]
           ports:
             - containerPort: 8080
+          # [START endpoints_secret2_yaml_go]
           # [START endpoints_secret_2]
           volumeMounts:
             - mountPath: /etc/nginx/creds
               name: service-account-creds
               readOnly: true
           # [END endpoints_secret_2]
+          # [END endpoints_secret2_yaml_go]
         - name: echo
           image: gcr.io/endpoints-release/echo:latest
           ports: