diff --git a/appengine/endpoints-frameworks-v2/backend/pom.xml b/appengine/endpoints-frameworks-v2/backend/pom.xml
index 30ee0c1e3d5..10162d88618 100644
--- a/appengine/endpoints-frameworks-v2/backend/pom.xml
+++ b/appengine/endpoints-frameworks-v2/backend/pom.xml
@@ -81,7 +81,7 @@
                             <mainClass>com.google.api.server.spi.tools.EndpointsTool</mainClass>
                             <arguments>
                                 <argument>get-swagger-doc</argument>
-                                <argument>--hostname=${endpoints.project.id}.appspot.com</argument>
+                                <argument>--hostname=echo-api.endpoints.${endpoints.project.id}.cloud.goog</argument>
                                 <argument>--war=target/echo-1.0-SNAPSHOT</argument>
                                 <argument>com.example.echo.Echo</argument>
                             </arguments>
diff --git a/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml
index 8f249f751a1..a326cf4f23a 100644
--- a/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml
@@ -28,6 +28,6 @@
     </system-properties>
 
    <env-variables>
-        <env-var name="ENDPOINTS_SERVICE_NAME" value="${endpoints.project.id}.appspot.com" />
+        <env-var name="ENDPOINTS_SERVICE_NAME" value="echo-api.endpoints.${endpoints.project.id}.cloud.goog" />
     </env-variables>
 </appengine-web-app>
diff --git a/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml
index 66db1fda503..56eec17a4c3 100644
--- a/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml
@@ -49,7 +49,7 @@
         </init-param>
         <init-param>
             <param-name>endpoints.serviceName</param-name>
-            <param-value>${endpoints.project.id}.appspot.com</param-value>
+            <param-value>echo-api.endpoints.${endpoints.project.id}.cloud.goog</param-value>
         </init-param>
     </filter>
 
diff --git a/endpoints/getting-started/pom.xml b/endpoints/getting-started/pom.xml
index 1bee4f5e64d..8fffee9370c 100644
--- a/endpoints/getting-started/pom.xml
+++ b/endpoints/getting-started/pom.xml
@@ -48,13 +48,10 @@
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     <plugins>
-      <plugin>  <!-- TEMPORARY -->
+      <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
         <version>2.0.9.121.v20160815</version>
-        <configuration>
-          <gcloud_app_prefix>beta</gcloud_app_prefix>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
diff --git a/endpoints/getting-started/src/main/appengine/app.yaml b/endpoints/getting-started/src/main/appengine/app.yaml
index 2f76f203522..92e2637bc03 100644
--- a/endpoints/getting-started/src/main/appengine/app.yaml
+++ b/endpoints/getting-started/src/main/appengine/app.yaml
@@ -6,8 +6,8 @@ handlers:
   script: this field is required, but ignored
   secure: always
 
-beta_settings:
-  # Enable Google Cloud Endpoints API management.
-  use_endpoints_api_management: true
-  # Specify the Open API specification.
-  endpoints_swagger_spec_file: openapi.yaml
+endpoints_api_service:
+  # The following values are to be replaced by information from the output of
+  # 'gcloud service-management deploy openapi.yaml' command.
+  name: ENDPOINTS SERVICE-NAME
+  config_id: ENDPOINTS CONFIG-ID
diff --git a/endpoints/getting-started/src/main/appengine/openapi.yaml b/endpoints/getting-started/src/main/appengine/openapi.yaml
index 71bac9ce62f..e990963ba1e 100644
--- a/endpoints/getting-started/src/main/appengine/openapi.yaml
+++ b/endpoints/getting-started/src/main/appengine/openapi.yaml
@@ -3,7 +3,7 @@ info:
   description: "A simple Google Cloud Endpoints API example."
   title: "Endpoints Example"
   version: "1.0.0"
-host: "YOUR-PROJECT-ID.appspot.com"
+host: "echo-api.endpoints.YOUR-PROJECT-ID.cloud.goog"
 basePath: "/"
 consumes:
 - "application/json"