diff --git a/appengine-java8/endpoints-v2-backend/build.gradle b/appengine-java8/endpoints-v2-backend/build.gradle
index 275b0454ae2..2e169b5cb8e 100644
--- a/appengine-java8/endpoints-v2-backend/build.gradle
+++ b/appengine-java8/endpoints-v2-backend/build.gradle
@@ -51,7 +51,7 @@ dependencies {
 
 endpointsServer {
   // Endpoints Framework Plugin server-side configuration
-  hostname = "echo-api.endpoints.${projectId}.cloud.goog"
+  hostname = "${projectId}.appspot.com"
 }
 
 sourceCompatibility = 1.8
diff --git a/appengine-java8/endpoints-v2-backend/pom.xml b/appengine-java8/endpoints-v2-backend/pom.xml
index cfd44a5ca1c..501c1427802 100644
--- a/appengine-java8/endpoints-v2-backend/pom.xml
+++ b/appengine-java8/endpoints-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=echo-api.endpoints.${endpoints.project.id}.cloud.goog</argument>
+                <argument>--hostname=${endpoints.project.id}.appspot.com</argument>
                 <argument>--war=target/echo-1.0-SNAPSHOT</argument>
                 <argument>com.example.echo.Echo</argument>
               </arguments>
diff --git a/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/appengine-web.xml
index 65f1329add0..320f4fa09af 100644
--- a/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/appengine-web.xml
@@ -27,6 +27,6 @@
     </system-properties>
 
    <env-variables>
-        <env-var name="ENDPOINTS_SERVICE_NAME" value="echo-api.endpoints.${endpoints.project.id}.cloud.goog" />
+        <env-var name="ENDPOINTS_SERVICE_NAME" value="${endpoints.project.id}.appspot.com" />
     </env-variables>
 </appengine-web-app>
diff --git a/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/web.xml b/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/web.xml
index 78661fb5d0a..7270ad54bf6 100644
--- a/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/web.xml
+++ b/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/web.xml
@@ -53,7 +53,7 @@
         </init-param>
         <init-param>
             <param-name>endpoints.serviceName</param-name>
-            <param-value>echo-api.endpoints.${endpoints.project.id}.cloud.goog</param-value>
+            <param-value>${endpoints.project.id}.appspot.com</param-value>
         </init-param>
     </filter>
 
diff --git a/appengine/endpoints-frameworks-v2/backend/build.gradle b/appengine/endpoints-frameworks-v2/backend/build.gradle
index e09ba4c3851..a5e8422b486 100644
--- a/appengine/endpoints-frameworks-v2/backend/build.gradle
+++ b/appengine/endpoints-frameworks-v2/backend/build.gradle
@@ -51,7 +51,7 @@ dependencies {
 
 endpointsServer {
   // Endpoints Framework Plugin server-side configuration
-  hostname = "echo-api.endpoints.${projectId}.cloud.goog"
+  hostname = "${projectId}.appspot.com"
 }
 
 sourceCompatibility = 1.7  // App Engine Standard uses Java 7
diff --git a/appengine/endpoints-frameworks-v2/backend/pom.xml b/appengine/endpoints-frameworks-v2/backend/pom.xml
index 200bf2eec21..9465073f73c 100644
--- a/appengine/endpoints-frameworks-v2/backend/pom.xml
+++ b/appengine/endpoints-frameworks-v2/backend/pom.xml
@@ -79,7 +79,7 @@
                             <mainClass>com.google.api.server.spi.tools.EndpointsTool</mainClass>
                             <arguments>
                                 <argument>get-swagger-doc</argument>
-                                <argument>--hostname=echo-api.endpoints.${endpoints.project.id}.cloud.goog</argument>
+                                <argument>--hostname=${endpoints.project.id}.appspot.com</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 15dfe35ee60..5a482456b7a 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="echo-api.endpoints.${endpoints.project.id}.cloud.goog" />
+        <env-var name="ENDPOINTS_SERVICE_NAME" value="${endpoints.project.id}.appspot.com" />
     </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 f8d1d03f98a..3535fc6b421 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>echo-api.endpoints.${endpoints.project.id}.cloud.goog</param-value>
+            <param-value>${endpoints.project.id}.appspot.com</param-value>
         </init-param>
     </filter>