diff --git a/integration/ServiceTestRuleSample/build.gradle b/integration/ServiceTestRuleSample/build.gradle
index 61cc2701c..2e7a15bf4 100644
--- a/integration/ServiceTestRuleSample/build.gradle
+++ b/integration/ServiceTestRuleSample/build.gradle
@@ -25,8 +25,8 @@ allprojects {
 
 ext {
     buildToolsVersion = "31.0.0"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
 }
diff --git a/runner/AndroidJunitRunnerSample/build.gradle b/runner/AndroidJunitRunnerSample/build.gradle
index 8006df0c8..12b2f88d2 100644
--- a/runner/AndroidJunitRunnerSample/build.gradle
+++ b/runner/AndroidJunitRunnerSample/build.gradle
@@ -27,9 +27,9 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
 }
diff --git a/runner/AndroidTestOrchestratorSample/build.gradle b/runner/AndroidTestOrchestratorSample/build.gradle
index 40eaa5dbc..e93cd8617 100644
--- a/runner/AndroidTestOrchestratorSample/build.gradle
+++ b/runner/AndroidTestOrchestratorSample/build.gradle
@@ -27,11 +27,11 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    monitorVersion = "1.5.0"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
-    orchestratorVersion = "1.4.1"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    monitorVersion = "1.6.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
+    orchestratorVersion = "1.4.2-alpha01"
 }
diff --git a/ui/espresso/AccessibilitySample/build.gradle b/ui/espresso/AccessibilitySample/build.gradle
index 15b455418..b5a45282b 100644
--- a/ui/espresso/AccessibilitySample/build.gradle
+++ b/ui/espresso/AccessibilitySample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlinVersion = "1.4.31"
+    ext.kotlinVersion = "1.6.10"
     ext.agpVersion = "7.0.2"
     repositories {
         // Insert local test repo here
@@ -29,10 +29,10 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     robolectricVersion = "4.6.1"
-    extTruthVersion = '1.3.1-alpha02'
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    extTruthVersion = "1.5.0-alpha04"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    espressoVersion = "3.5.0-alpha04"
     guavaVersion = "30.1.1-android"
 }
diff --git a/ui/espresso/BasicSample/build.gradle b/ui/espresso/BasicSample/build.gradle
index f211f48e2..27fa20a92 100644
--- a/ui/espresso/BasicSample/build.gradle
+++ b/ui/espresso/BasicSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlinVersion = "1.4.31"
+    ext.kotlinVersion = "1.6.10"
     ext.agpVersion = "7.0.2"
     repositories {
         // Insert local test repo here
@@ -30,9 +30,9 @@ ext {
     androidxAnnotationVersion = "1.2.0"
     robolectricVersion = "4.6.1"
     guavaVersion = "30.1.1-android"
-    extTruthVersion = '1.3.0-rc01'
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    extTruthVersion = "1.5.0-alpha04"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    espressoVersion = "3.5.0-alpha04"
 }
diff --git a/ui/espresso/CustomMatcherSample/build.gradle b/ui/espresso/CustomMatcherSample/build.gradle
index ee03127fe..3486d4e65 100644
--- a/ui/espresso/CustomMatcherSample/build.gradle
+++ b/ui/espresso/CustomMatcherSample/build.gradle
@@ -27,10 +27,10 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
     robolectricVersion = "4.6.1"
 }
diff --git a/ui/espresso/DataAdapterSample/build.gradle b/ui/espresso/DataAdapterSample/build.gradle
index cee8ba697..2d1b2554d 100644
--- a/ui/espresso/DataAdapterSample/build.gradle
+++ b/ui/espresso/DataAdapterSample/build.gradle
@@ -27,9 +27,9 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    espressoVersion = "3.5.0-alpha04"
     robolectricVersion = "4.6.1"
 }
diff --git a/ui/espresso/FragmentScenarioSample/build.gradle b/ui/espresso/FragmentScenarioSample/build.gradle
index 3f58e67be..6a57513db 100644
--- a/ui/espresso/FragmentScenarioSample/build.gradle
+++ b/ui/espresso/FragmentScenarioSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlinVersion = "1.4.31"
+    ext.kotlinVersion = "1.6.10"
     ext.agpVersion = "7.0.2"
     repositories {
         google()
@@ -31,11 +31,11 @@ ext {
     androidxCoreVersion = "1.6.0"
     androidxCompatVersion = "1.3.1"
     androidxFragmentVersion = "1.3.6"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
     robolectricVersion = "4.6.1"
     truthVersion = "1.1.3"
 }
diff --git a/ui/espresso/IdlingResourceSample/build.gradle b/ui/espresso/IdlingResourceSample/build.gradle
index e3a29a9e4..88614054b 100644
--- a/ui/espresso/IdlingResourceSample/build.gradle
+++ b/ui/espresso/IdlingResourceSample/build.gradle
@@ -43,8 +43,8 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    espressoVersion = "3.5.0-alpha04"
 }
diff --git a/ui/espresso/IntentsAdvancedSample/build.gradle b/ui/espresso/IntentsAdvancedSample/build.gradle
index 9fa91c24b..ab0d535bf 100644
--- a/ui/espresso/IntentsAdvancedSample/build.gradle
+++ b/ui/espresso/IntentsAdvancedSample/build.gradle
@@ -26,9 +26,9 @@ allprojects {
 ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
 }
diff --git a/ui/espresso/IntentsBasicSample/build.gradle b/ui/espresso/IntentsBasicSample/build.gradle
index a07cb8189..55a914748 100644
--- a/ui/espresso/IntentsBasicSample/build.gradle
+++ b/ui/espresso/IntentsBasicSample/build.gradle
@@ -27,12 +27,12 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     androidxCoreVersion = "1.6.0"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    extTruthVersion = "1.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    extTruthVersion = "1.5.0-alpha04"
     robolectricVersion = "4.6.1"
 }
diff --git a/ui/espresso/MultiProcessSample/build.gradle b/ui/espresso/MultiProcessSample/build.gradle
index 9dbf9b7ba..a3fc1f190 100644
--- a/ui/espresso/MultiProcessSample/build.gradle
+++ b/ui/espresso/MultiProcessSample/build.gradle
@@ -46,9 +46,9 @@ task clean(type: Delete) {
 ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
 }
diff --git a/ui/espresso/MultiWindowSample/build.gradle b/ui/espresso/MultiWindowSample/build.gradle
index 9ab44c804..a4386405e 100644
--- a/ui/espresso/MultiWindowSample/build.gradle
+++ b/ui/espresso/MultiWindowSample/build.gradle
@@ -27,10 +27,10 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
 }
 
diff --git a/ui/espresso/RecyclerViewSample/build.gradle b/ui/espresso/RecyclerViewSample/build.gradle
index 4b08c51ca..8091e1068 100644
--- a/ui/espresso/RecyclerViewSample/build.gradle
+++ b/ui/espresso/RecyclerViewSample/build.gradle
@@ -44,9 +44,9 @@ ext {
     androidxAnnotationVersion = "1.2.0"
     androidxRecyclerVersion = "1.2.1"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
 }
diff --git a/ui/espresso/ScreenshotSample/build.gradle b/ui/espresso/ScreenshotSample/build.gradle
index 6c0f0b521..d859f4598 100644
--- a/ui/espresso/ScreenshotSample/build.gradle
+++ b/ui/espresso/ScreenshotSample/build.gradle
@@ -1,16 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.agpVersion = "7.2.0-alpha03"
-    ext.kotlinVersion = '1.5.31'
+    ext.agpVersion = "7.0.2"
+    ext.kotlinVersion = "1.6.10"
     ext.androidxCoreVersion = "1.6.0"
     ext.buildToolsVersion = "31.0.0"
     ext.androidxCompatVersion = "1.3.1"
-    ext.coreVersion = "1.4.1-alpha03"
-    ext.extJUnitVersion = "1.1.4-alpha03"
-    ext.runnerVersion = "1.4.1-alpha03"
-    ext.rulesVersion = "1.4.1-alpha03"
-    ext.espressoVersion = "3.5.0-alpha03"
-    ext.servicesVersion = "1.4.1"
+    ext.coreVersion = "1.4.1-alpha04"
+    ext.extJUnitVersion = "1.1.4-alpha04"
+    ext.runnerVersion = "1.5.0-alpha01"
+    ext.rulesVersion = "1.4.1-alpha04"
+    ext.espressoVersion = "3.5.0-alpha04"
+    ext.servicesVersion = "1.4.2-alpha01"
     ext.truthVersion = "1.1.3"
 
     repositories {
diff --git a/ui/espresso/WebBasicSample/build.gradle b/ui/espresso/WebBasicSample/build.gradle
index 8006df0c8..12b2f88d2 100644
--- a/ui/espresso/WebBasicSample/build.gradle
+++ b/ui/espresso/WebBasicSample/build.gradle
@@ -27,9 +27,9 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
 }
diff --git a/ui/uiautomator/BasicSample/build.gradle b/ui/uiautomator/BasicSample/build.gradle
index 979d6fe12..d74976c3e 100644
--- a/ui/uiautomator/BasicSample/build.gradle
+++ b/ui/uiautomator/BasicSample/build.gradle
@@ -24,10 +24,10 @@ ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
+    rulesVersion = "1.4.1-alpha04"
+    espressoVersion = "3.5.0-alpha04"
     uiAutomatorVersion = "2.2.0"
 }
diff --git a/unit/BasicUnitAndroidTest/build.gradle b/unit/BasicUnitAndroidTest/build.gradle
index 897fe9d15..ae4522941 100644
--- a/unit/BasicUnitAndroidTest/build.gradle
+++ b/unit/BasicUnitAndroidTest/build.gradle
@@ -26,9 +26,9 @@ allprojects {
 ext {
     buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
+    coreVersion = "1.4.1-alpha04"
+    extJUnitVersion = "1.1.4-alpha04"
+    runnerVersion = "1.5.0-alpha01"
     hamcrestVersion = "1.3"
     truthVersion = "1.1.3"
 }
diff --git a/update_versions.sh b/update_versions.sh
index f9786f931..3203dadb9 100755
--- a/update_versions.sh
+++ b/update_versions.sh
@@ -8,29 +8,30 @@ set -ex  # Exit immediately if a command exits with a non-zero status.
 #repourl="file:\/\/\/tmp\/test_repo\/m2repository"
 #repourl="https:\/\/oss.sonatype.org\/content\/repositories\/orgrobolectric-1216"
 #repourl="http:\/\/localhost:1480"
+# Versions:                             # axt_versions.bzl equivalents
 buildToolsVersion="31.0.0"
 agpVersion="7.0.2"
-kotlinVersion="1.4.31"
+kotlinVersion="1.6.10"                  # KOTLIN_VERSION
 compileSdkVersion="30"
 targetSdkVersion="30"
-androidxAnnotationVersion="1.2.0"
-androidxCompatVersion="1.3.1"
-androidxCoreVersion="1.6.0"
-androidxFragmentVersion="1.3.6"
-androidxRecyclerVersion="1.2.1"
-guavaVersion="30.1.1-android"
-truthVersion="1.1.3"
-runnerVersion="1.4.1-alpha03"
-monitorVersion="1.5.0"
-rulesVersion="1.4.1-alpha03"
-servicesVersion="1.4.1"
-orchestratorVersion="1.4.1"
-coreVersion="1.4.1-alpha03"
-extJUnitVersion="1.1.4-alpha03"
-extTruthVersion="1.5.0-alpha03"
-espressoVersion="3.5.0-alpha03"
+androidxAnnotationVersion="1.2.0"       # ANDROIDX_ANNOTATION_VERSION
+androidxCompatVersion="1.3.1"           # ANDROIDX_COMPAT_VERSION
+androidxCoreVersion="1.6.0"             # ANDROIDX_CORE_VERSION
+androidxFragmentVersion="1.3.6"         # ANDROIDX_FRAGMENT_VERSION
+androidxRecyclerVersion="1.2.1"         # ANDROIDX_RECYCLERVIEW_VERSION
+guavaVersion="30.1.1-android"           # GUAVA_VERSION
+truthVersion="1.1.3"                    # TRUTH_VERSION
+runnerVersion="1.5.0-alpha01"           # RUNNER_VERSION
+monitorVersion="1.6.0-alpha01"          # MONITOR_VERSION
+rulesVersion="1.4.1-alpha04"            # RULES_VERSION
+servicesVersion="1.4.2-alpha01"         # SERVICES_VERSION
+orchestratorVersion="1.4.2-alpha01"     # ORCHESTRATOR_VERSION
+coreVersion="1.4.1-alpha04"             # CORE_VERSION
+extJUnitVersion="1.1.4-alpha04"         # ANDROIDX_JUNIT_VERSION
+extTruthVersion="1.5.0-alpha04"         # ANDROIDX_TRUTH_VERSION
+espressoVersion="3.5.0-alpha04"         # ESPRESSO_VERSION
 robolectricVersion="4.6.1"
-uiAutomatorVersion="2.2.0"
+uiAutomatorVersion="2.2.0"              # UIAUTOMATOR_VERSION
 
 for p in $(cat projects.conf); do
    echo
@@ -40,32 +41,34 @@ for p in $(cat projects.conf); do
    pushd $p > /dev/null  # Silent pushd
 
    # Replace versions
-   sed -i "s/buildToolsVersion = \".*\"/buildToolsVersion = \"$buildToolsVersion\"/" build.gradle
-   sed -i "s/agpVersion = \".*\"/agpVersion = \"$agpVersion\"/" build.gradle
-   sed -i "s/kotlinVersion = \".*\"/kotlinVersion = \"$kotlinVersion\"/" build.gradle
-   sed -i "s/coreVersion = \".*\"/coreVersion = \"$coreVersion\"/" build.gradle
-   sed -i "s/extJUnitVersion = \".*\"/extJUnitVersion = \"$extJUnitVersion\"/" build.gradle
-   sed -i "s/extTruthVersion = \".*\"/extTruthVersion = \"$extTruthVersion\"/" build.gradle
-   sed -i "s/monitorVersion = \".*\"/monitorVersion = \"$monitorVersion\"/" build.gradle
-   sed -i "s/runnerVersion = \".*\"/runnerVersion = \"$runnerVersion\"/" build.gradle
-   sed -i "s/rulesVersion = \".*\"/rulesVersion = \"$rulesVersion\"/" build.gradle
-   sed -i "s/servicesVersion = \".*\"/servicesVersion = \"$servicesVersion\"/" build.gradle
-   sed -i "s/orchestratorVersion = \".*\"/orchestratorVersion = \"$orchestratorVersion\"/" build.gradle
-   sed -i "s/espressoVersion = \".*\"/espressoVersion = \"$espressoVersion\"/" build.gradle
-   sed -i "s/androidxAnnotationVersion = \".*\"/androidxAnnotationVersion = \"$androidxAnnotationVersion\"/" build.gradle
-   sed -i "s/androidxCompatVersion = \".*\"/androidxCompatVersion = \"$androidxCompatVersion\"/" build.gradle
-   sed -i "s/androidxCoreVersion = \".*\"/androidxCoreVersion = \"$androidxCoreVersion\"/" build.gradle
-   sed -i "s/androidxFragmentVersion = \".*\"/androidxFragmentVersion = \"$androidxFragmentVersion\"/" build.gradle
-   sed -i "s/androidxRecyclerVersion = \".*\"/androidxRecyclerVersion = \"$androidxRecyclerVersion\"/" build.gradle
-   sed -i "s/guavaVersion = \".*\"/guavaVersion = \"$guavaVersion\"/" build.gradle
-   sed -i "s/truthVersion = \".*\"/truthVersion = \"$truthVersion\"/" build.gradle
+   sed -i "s/buildToolsVersion = \([\"']\).*\1/buildToolsVersion = \"$buildToolsVersion\"/" build.gradle
+   sed -i "s/agpVersion = \([\"']\).*\1/agpVersion = \"$agpVersion\"/" build.gradle
+   sed -i "s/kotlinVersion = \([\"']\).*\1/kotlinVersion = \"$kotlinVersion\"/" build.gradle
+   sed -i "s/coreVersion = \([\"']\).*\1/coreVersion = \"$coreVersion\"/" build.gradle
+   sed -i "s/extJUnitVersion = \([\"']\).*\1/extJUnitVersion = \"$extJUnitVersion\"/" build.gradle
+   sed -i "s/extTruthVersion = \([\"']\).*\1/extTruthVersion = \"$extTruthVersion\"/" build.gradle
+   sed -i "s/monitorVersion = \([\"']\).*\1/monitorVersion = \"$monitorVersion\"/" build.gradle
+   sed -i "s/runnerVersion = \([\"']\).*\1/runnerVersion = \"$runnerVersion\"/" build.gradle
+   sed -i "s/rulesVersion = \([\"']\).*\1/rulesVersion = \"$rulesVersion\"/" build.gradle
+   sed -i "s/servicesVersion = \([\"']\).*\1/servicesVersion = \"$servicesVersion\"/" build.gradle
+   sed -i "s/orchestratorVersion = \([\"']\).*\1/orchestratorVersion = \"$orchestratorVersion\"/" build.gradle
+   sed -i "s/espressoVersion = \([\"']\).*\1/espressoVersion = \"$espressoVersion\"/" build.gradle
+   sed -i "s/androidxAnnotationVersion = \([\"']\).*\1/androidxAnnotationVersion = \"$androidxAnnotationVersion\"/" build.gradle
+   sed -i "s/androidxCompatVersion = \([\"']\).*\1/androidxCompatVersion = \"$androidxCompatVersion\"/" build.gradle
+   sed -i "s/androidxCoreVersion = \([\"']\).*\1/androidxCoreVersion = \"$androidxCoreVersion\"/" build.gradle
+   sed -i "s/androidxFragmentVersion = \([\"']\).*\1/androidxFragmentVersion = \"$androidxFragmentVersion\"/" build.gradle
+   sed -i "s/androidxRecyclerVersion = \([\"']\).*\1/androidxRecyclerVersion = \"$androidxRecyclerVersion\"/" build.gradle
+   sed -i "s/guavaVersion = \([\"']\).*\1/guavaVersion = \"$guavaVersion\"/" build.gradle
+   sed -i "s/truthVersion = \([\"']\).*\1/truthVersion = \"$truthVersion\"/" build.gradle
    sed -i "s/compileSdkVersion .*/compileSdkVersion $compileSdkVersion/" app/build.gradle
    sed -i "s/targetSdkVersion .*/targetSdkVersion $targetSdkVersion/" app/build.gradle
-   sed -i "s/uiAutomatorVersion = \".*\"/uiAutomatorVersion = \"$uiAutomatorVersion\"/" build.gradle
-   sed -i "s/robolectricVersion = \".*\"/robolectricVersion = \"$robolectricVersion\"/" build.gradle
+   sed -i "s/uiAutomatorVersion = \([\"']\).*\1/uiAutomatorVersion = \"$uiAutomatorVersion\"/" build.gradle
+   sed -i "s/robolectricVersion = \([\"']\).*\1/robolectricVersion = \"$robolectricVersion\"/" build.gradle
    if [ ! -z "$repourl" ]
    then
-         sed -i "s/.*google()/        google()\n        maven {\n            url \"$repourl\"\n          allowInsecureProtocol=true\n        }/" build.gradle
+      for G in build.gradle settings.gradle; do
+          sed -i "s/.*google()/        google()\n        maven {\n            url \"$repourl\"\n          allowInsecureProtocol=true\n        }/" $G
+      done
    fi
    popd > /dev/null  # Silent popd
   done