diff --git a/buildscripts/kokoro/gae-interop.sh b/buildscripts/kokoro/gae-interop.sh
index c3b414a528..9299cc23bf 100755
--- a/buildscripts/kokoro/gae-interop.sh
+++ b/buildscripts/kokoro/gae-interop.sh
@@ -26,15 +26,6 @@ cd ./github/grpc-java
 ##
 ## Deploy the dummy 'default' version of the service
 ##
-echo "<?xml version='1.0' encoding='utf-8'?>
-<appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
-  <threadsafe>true</threadsafe>
-  <service>$KOKORO_GAE_SERVICE</service>
-  <runtime>java8</runtime>
-</appengine-web-app>
-" > ./gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml
-cat ./gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml
-
 GRADLE_FLAGS="--stacktrace -DgaeStopPreviousVersion=false -DgaePromote=false -PskipCodegen=true"
 DUMMY_EXISTS_CMD="gcloud app versions describe $DUMMY_DEFAULT_VERSION --service=$KOKORO_GAE_SERVICE"
 DEPLOY_DUMMY_CMD="./gradlew $GRADLE_FLAGS -DgaeDeployVersion=$DUMMY_DEFAULT_VERSION :grpc-gae-interop-testing-jdk8:appengineDeploy"
@@ -51,33 +42,11 @@ else
 fi
 set -e
 
-##
-## Begin JDK8 test
-##
-echo "<?xml version='1.0' encoding='utf-8'?>
-<appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
-  <threadsafe>true</threadsafe>
-  <service>$KOKORO_GAE_SERVICE</service>
-  <runtime>java8</runtime>
-</appengine-web-app>
-" > ./gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml
-cat ./gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml
 # Deploy and test the real app (jdk8)
-./gradlew $GRADLE_FLAGS -DgaeDeployVersion=$KOKORO_GAE_APP_VERSION :grpc-gae-interop-testing-jdk8:runInteropTestRemote
+./gradlew $GRADLE_FLAGS -DgaeDeployVersion="$KOKORO_GAE_APP_VERSION" :grpc-gae-interop-testing-jdk8:runInteropTestRemote
 
-##
-## Begin JDK7 test
-##
-echo "<?xml version='1.0' encoding='utf-8'?>
-<appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
-  <threadsafe>true</threadsafe>
-  <service>$KOKORO_GAE_SERVICE</service>
-  <runtime>java7</runtime>
-</appengine-web-app>
-" > ./gae-interop-testing/gae-jdk7/src/main/webapp/WEB-INF/appengine-web.xml
-cat ./gae-interop-testing/gae-jdk7/src/main/webapp/WEB-INF/appengine-web.xml
 # Deploy and test the real app (jdk7)
-./gradlew $GRADLE_FLAGS -DgaeDeployVersion=$KOKORO_GAE_APP_VERSION :grpc-gae-interop-testing-jdk7:runInteropTestRemote
+./gradlew $GRADLE_FLAGS -DgaeDeployVersion="$KOKORO_GAE_APP_VERSION" :grpc-gae-interop-testing-jdk7:runInteropTestRemote
 
 set +e
 echo "Cleaning out stale deploys from previous runs, it is ok if this part fails"
diff --git a/gae-interop-testing/gae-jdk7/src/main/webapp/WEB-INF/appengine-web.xml b/gae-interop-testing/gae-jdk7/src/main/webapp/WEB-INF/appengine-web.xml
index 30227a4000..a1963ce0c9 100644
--- a/gae-interop-testing/gae-jdk7/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/gae-interop-testing/gae-jdk7/src/main/webapp/WEB-INF/appengine-web.xml
@@ -12,10 +12,9 @@
   limitations under the License.
 -->
 <!-- [START config] -->
-<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-  <application>YOUR-PROJECT-ID</application>
-  <version>YOUR-VERSION-ID</version>
+<appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
   <threadsafe>true</threadsafe>
+  <service>java-gae-interop-test</service>
   <runtime>java7</runtime>
 </appengine-web-app>
 <!-- [END config] -->
diff --git a/gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml b/gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml
index 3df51fb699..d8532dfc69 100644
--- a/gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml
@@ -12,10 +12,9 @@
   limitations under the License.
 -->
 <!-- [START config] -->
-<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-  <application>YOUR-PROJECT-ID</application>
-  <version>YOUR-VERSION-ID</version>
+<appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
   <threadsafe>true</threadsafe>
+  <service>java-gae-interop-test</service>
   <runtime>java8</runtime>
 </appengine-web-app>
 <!-- [END config] -->