diff --git a/MediaServiceCore b/MediaServiceCore
index 3bc1857e1..86d7b6e9f 160000
--- a/MediaServiceCore
+++ b/MediaServiceCore
@@ -1 +1 @@
-Subproject commit 3bc1857e1d40e5f71fe428835e38096568340af6
+Subproject commit 86d7b6e9f73b77d0b29325ca9b9abd39e61784f0
diff --git a/SharedModules b/SharedModules
index 9c22818cf..3203cd507 160000
--- a/SharedModules
+++ b/SharedModules
@@ -1 +1 @@
-Subproject commit 9c22818cfa4f68c368669e5d1d7946f0d5599b25
+Subproject commit 3203cd507e6d6598336a2df3a9f3cfadbbb19a09
diff --git a/build.gradle b/build.gradle
index 565ce5231..2cd0bb84f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 apply from: gradle.ext.sharedModulesConstants
 
+// NOT working
+// Running 'gradle wrapper' will generate gradlew
+wrapper {
+    gradleVersion = gradleVersion
+    distributionType = Wrapper.DistributionType.BIN
+}
+
 buildscript {
     apply from: gradle.ext.sharedModulesConstants
 
@@ -10,7 +17,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'com.android.tools.build:gradle:' + androidGradleVersion
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:' + kotlinVersion
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/chatkit/build.gradle b/chatkit/build.gradle
index 808f1c827..aa91ac2ca 100644
--- a/chatkit/build.gradle
+++ b/chatkit/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     implementation project(':sharedutils')
 
     implementation 'androidx.appcompat:appcompat:' + appCompatXLibraryVersion
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation "com.google.android:flexbox:1.0.0"
+    implementation 'com.google.android.material:material:' + materialVersion
+    implementation "com.google.android:flexbox:" + flexboxVersion
     implementation 'androidx.recyclerview:recyclerview:' + recyclerviewXLibraryVersion
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f75a4253e..1a326c979 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,5 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-#distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
diff --git a/smarttubetv/build.gradle b/smarttubetv/build.gradle
index 57018a892..8710dc14f 100644
--- a/smarttubetv/build.gradle
+++ b/smarttubetv/build.gradle
@@ -138,7 +138,7 @@ android {
         variant.outputs.each { output ->
             def project = "STubeNext"
             def flavor = variant.productFlavors[-1].name
-            def buildType = variant.variantData.variantConfiguration.buildType.name.take(1)
+            def buildType = variant.buildType.name.take(1)
             def version = variant.versionName
 
             def newApkName = sprintf("%s_%s_v%s_%s.apk", [project, flavor, version, buildType])