diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml
index 2943f3e..96b1f4b 100644
--- a/.circleci/test-deploy.yml
+++ b/.circleci/test-deploy.yml
@@ -258,7 +258,7 @@ workflows:
           name: "ui-tests-<<matrix.system-image>>"
           executor:
             name: android/android-machine
-            tag: "202102-01"
+            tag: "default"
           checkout: false
           pre-steps:
             - run:
@@ -277,10 +277,10 @@ workflows:
           filters: *filters
       - test-emulator-commands:
           system-image: "system-images;android-29;default;x86"
-          tag: "202102-01"
+          tag: "default"
           filters: *filters
       - test-start-emulator-and-run-tests:
-          tag: "202102-01"
+          tag: "default"
           filters: *filters
       - test-fastlane
       - orb-tools/pack:
diff --git a/src/examples/granular-commands.yml b/src/examples/granular-commands.yml
index 95a72bc..0a1cfdc 100644
--- a/src/examples/granular-commands.yml
+++ b/src/examples/granular-commands.yml
@@ -5,12 +5,12 @@ description: |
 usage:
   version: 2.1
   orbs:
-    android: circleci/android@2.0
+    android: circleci/android@2.4.0
   jobs:
     test:
       executor:
         name: android/android-machine
-        tag: "2021.10.1"
+        tag: "default"
         resource-class: large
       steps:
         - checkout
diff --git a/src/examples/override-machine-resource-class.yml b/src/examples/override-machine-resource-class.yml
index 0c70a6e..64d2076 100644
--- a/src/examples/override-machine-resource-class.yml
+++ b/src/examples/override-machine-resource-class.yml
@@ -3,11 +3,12 @@ description: |
 usage:
   version: 2.1
   orbs:
-    android: circleci/android@2.0
+    android: circleci/android@2.4.0
   workflows:
     test:
       jobs:
         - android/run-ui-tests:
             executor:
               name: android/android-machine
+              tag: "default"
               resource-class: xlarge
diff --git a/src/examples/run-ui-tests-job.yml b/src/examples/run-ui-tests-job.yml
index 0608717..f3b44b7 100644
--- a/src/examples/run-ui-tests-job.yml
+++ b/src/examples/run-ui-tests-job.yml
@@ -6,7 +6,7 @@ description: |
 usage:
   version: 2.1
   orbs:
-    android: circleci/android@2.0
+    android: circleci/android@2.4.0
   workflows:
     test:
       jobs:
diff --git a/src/examples/start-emulator-and-run-tests.yml b/src/examples/start-emulator-and-run-tests.yml
index 5fea689..58dcd17 100644
--- a/src/examples/start-emulator-and-run-tests.yml
+++ b/src/examples/start-emulator-and-run-tests.yml
@@ -6,11 +6,12 @@ description: |
 usage:
   version: 2.1
   orbs:
-    android: circleci/android@2.0
+    android: circleci/android@2.4.0
   jobs:
     test:
       executor:
         name: android/android-machine
+        tag: "default"
         resource-class: large
       steps:
         - checkout
diff --git a/src/examples/test-matrix.yml b/src/examples/test-matrix.yml
index 3ffc8d6..913c38a 100644
--- a/src/examples/test-matrix.yml
+++ b/src/examples/test-matrix.yml
@@ -4,7 +4,7 @@ description: |
 usage:
   version: 2.1
   orbs:
-    android: circleci/android@2.0
+    android: circleci/android@2.4.0
   workflows:
     test:
       jobs: