diff --git a/buildScripts/gradle/maven.gradle b/buildScripts/gradle/maven.gradle
index 51427d23c..d544526be 100644
--- a/buildScripts/gradle/maven.gradle
+++ b/buildScripts/gradle/maven.gradle
@@ -126,6 +126,22 @@ publishing {
                 setScm(scm)
             }
         }
+        // Plugin Marker Artifacts
+        // https://docs.gradle.org/current/userguide/plugins.html#sec:plugin_markers
+        pluginMarker(MavenPublication) {
+            def pluginId = 'com.tencent.shadow.plugin'
+            groupId pluginId
+            artifactId pluginId + '.gradle.plugin'
+            version publicationVersion
+
+            pom.withXml {
+                def root = asNode()
+                def dependencies = root.appendNode('dependencies')
+                dependencies.append(getDependencyNode('compile', coreGroupId, 'gradle-plugin', publicationVersion))
+                def scm = root.appendNode('scm')
+                setScm(scm)
+            }
+        }
         manifestParser(MavenPublication) {
             groupId coreGroupId
             artifactId 'manifest-parser'
diff --git a/projects/test/gradle-plugin-agp-compat-test/settings.gradle b/projects/test/gradle-plugin-agp-compat-test/settings.gradle
index add123a22..ab6c7c9f3 100644
--- a/projects/test/gradle-plugin-agp-compat-test/settings.gradle
+++ b/projects/test/gradle-plugin-agp-compat-test/settings.gradle
@@ -1,3 +1,14 @@
+pluginManagement {
+    repositories {
+        if (!System.getenv().containsKey("DISABLE_TENCENT_MAVEN_MIRROR")) {
+            maven { url 'https://mirrors.tencent.com/nexus/repository/maven-public/' }
+        } else {
+            google()
+            mavenCentral()
+        }
+        mavenLocal()
+    }
+}
 rootProject.name = 'gradle-plugin-agp-compat-test'
 if (SetGradleVersion != 'true') {
     include 'stub-project'
diff --git a/projects/test/gradle-plugin-agp-compat-test/stub-project/build.gradle b/projects/test/gradle-plugin-agp-compat-test/stub-project/build.gradle
index 2130ccd64..4aaacabea 100644
--- a/projects/test/gradle-plugin-agp-compat-test/stub-project/build.gradle
+++ b/projects/test/gradle-plugin-agp-compat-test/stub-project/build.gradle
@@ -23,9 +23,15 @@ buildscript {
         classpath "com.tencent.shadow.core:gradle-plugin:$ShadowVersion"
     }
 }
-
-apply plugin: 'com.android.application'
-apply plugin: 'com.tencent.shadow.plugin'
+try {
+    plugins {
+        id 'com.android.application' version "$TestAGPVersion" apply true
+        id 'com.tencent.shadow.plugin' version "$ShadowVersion" apply true
+    }
+} catch (Exception ignored) {
+    apply plugin: 'com.android.application'
+    apply plugin: 'com.tencent.shadow.plugin'
+}
 
 allprojects {
     repositories {