diff --git a/all/build.gradle b/all/build.gradle
index 11eec4b7ff8..60149e4679c 100644
--- a/all/build.gradle
+++ b/all/build.gradle
@@ -38,7 +38,7 @@ for (subproject in subprojects) {
 evaluationDependsOn(':grpc-interop-testing')
 
 dependencies {
-    api subprojects.minus([project(':grpc-protobuf-lite')])
+    api subprojects.minus([project.project(':grpc-protobuf-lite')])
     implementation libraries.guava.jre // JRE required by transitive protobuf-java-util
 }
 
diff --git a/gae-interop-testing/gae-jdk8/build.gradle b/gae-interop-testing/gae-jdk8/build.gradle
index af0c27f8350..0e565449463 100644
--- a/gae-interop-testing/gae-jdk8/build.gradle
+++ b/gae-interop-testing/gae-jdk8/build.gradle
@@ -24,7 +24,7 @@ plugins {
     id "war"
 
     id "ru.vyarus.animalsniffer"
-    id 'com.google.cloud.tools.appengine'
+    id 'com.google.cloud.tools.appengine-appenginewebxml'
 }
 
 description = 'gRPC: gae interop testing (jdk8)'
@@ -102,7 +102,7 @@ String getGaeProject() {
 }
 
 String getService(java.nio.file.Path projectPath) {
-    Node xml = new XmlParser().parse(projectPath.resolve("src/main/webapp/WEB-INF/appengine-web.xml").toFile())
+    Node xml = new groovy.xml.XmlParser().parse(projectPath.resolve("src/main/webapp/WEB-INF/appengine-web.xml").toFile())
     if (xml.service.isEmpty()) {
         return "default"
     } else {
diff --git a/netty/shaded/build.gradle b/netty/shaded/build.gradle
index 27816f9380b..2c5a6034d1e 100644
--- a/netty/shaded/build.gradle
+++ b/netty/shaded/build.gradle
@@ -62,7 +62,7 @@ dependencies {
             project(':grpc-testing-proto'),
             project(':grpc-testing'),
             libraries.truth
-    shadow project(':grpc-netty').configurations.runtimeClasspath.allDependencies.matching {
+    shadow project.project(':grpc-netty').configurations.runtimeClasspath.allDependencies.matching {
         it.group != 'io.netty'
     }
     signature (libraries.signature.java) {
diff --git a/settings.gradle b/settings.gradle
index 0322a9a1fbd..095e98d32aa 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,7 +20,7 @@ pluginManagement {
 	// https://github.com/kt3k/coveralls-gradle-plugin/tags
         id "com.github.kt3k.coveralls" version "2.12.2"
 	// https://github.com/GoogleCloudPlatform/appengine-plugins/releases
-        id "com.google.cloud.tools.appengine" version "2.8.7"
+        id "com.google.cloud.tools.appengine-appenginewebxml" version "2.8.7"
         // https://github.com/GoogleContainerTools/jib/blob/master/jib-gradle-plugin/CHANGELOG.md
         id "com.google.cloud.tools.jib" version "3.5.4"
 	// https://github.com/google/osdetector-gradle-plugin/tags