diff --git a/src/android/CHIPTest/app/src/main/java/com/tcl/chip/chiptest/MainActivity.kt b/src/android/CHIPTest/app/src/main/java/com/tcl/chip/chiptest/MainActivity.kt
index 2755e8d44c056b..318e43d5c5bff0 100644
--- a/src/android/CHIPTest/app/src/main/java/com/tcl/chip/chiptest/MainActivity.kt
+++ b/src/android/CHIPTest/app/src/main/java/com/tcl/chip/chiptest/MainActivity.kt
@@ -52,9 +52,7 @@ class MainActivity : AppCompatActivity() {
                 mainHandler.sendMessage(msg)
             }.start()
         }
-        AndroidChipPlatform.getInstance().setConfigurationManager(DefaultConfigurationManager(this))
-        AndroidChipPlatform.getInstance().setKeyValueStoreManager(PreferencesKeyValueStoreManager(this))
-        AndroidChipPlatform.getInstance().setServiceResolver(NsdManagerServiceResolver(this))
-        AndroidChipPlatform.getInstance().bleManager = AndroidBLEManager()
+
+        AndroidChipPlatform(AndroidBleManager(), PreferencesKeyValueStoreManager(this), PreferencesConfigurationManager(this), NsdManagerServiceResolver(this))
     }
 }
diff --git a/src/android/CHIPTest/gradle/wrapper/gradle-wrapper.properties b/src/android/CHIPTest/gradle/wrapper/gradle-wrapper.properties
index 359bf7fcb62c5f..f24728e6c60540 100644
--- a/src/android/CHIPTest/gradle/wrapper/gradle-wrapper.properties
+++ b/src/android/CHIPTest/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Aug 16 17:10:29 CST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME