diff --git a/appengine-java8/endpoints-v2-skeleton/build.gradle b/appengine-java8/endpoints-v2-skeleton/build.gradle
index bbecaa6c7b8..e277cacdfd9 100644
--- a/appengine-java8/endpoints-v2-skeleton/build.gradle
+++ b/appengine-java8/endpoints-v2-skeleton/build.gradle
@@ -46,10 +46,10 @@ dependencies {
 }
 // [END dependencies]
 
+// [START endpoints_server_configuration]
 // You must replace YOUR_PROJECT_ID with your Google Cloud Project Id
 def projectId = 'YOUR_PROJECT_ID'
 
-// [START endpoints_server_configuration]
 endpointsServer {
   // Endpoints Framework Plugin server-side configuration
   hostname = "${projectId}.appspot.com"
diff --git a/appengine-java8/endpoints-v2-skeleton/pom.xml b/appengine-java8/endpoints-v2-skeleton/pom.xml
index 123b4031133..aa260fe473d 100644
--- a/appengine-java8/endpoints-v2-skeleton/pom.xml
+++ b/appengine-java8/endpoints-v2-skeleton/pom.xml
@@ -90,6 +90,7 @@
                     <!-- deploy configuration -->
                 </configuration>
             </plugin>
+            <!-- [START endpoints_maven_configuration] -->
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>endpoints-framework-maven-plugin</artifactId>
@@ -103,6 +104,7 @@
                     <hostname>YOUR_PROJECT_ID.appspot.com</hostname>
                 </configuration>
             </plugin>
+            <!-- [END endpoints_maven_configuration] -->
         </plugins>
     </build>
     <!-- [END pom_build] -->