diff --git a/dockerfiles/android/Dockerfile b/dockerfiles/android/Dockerfile
index 294d649b..e5512786 100644
--- a/dockerfiles/android/Dockerfile
+++ b/dockerfiles/android/Dockerfile
@@ -27,12 +27,12 @@ ENV ANDROID_HOME /usr/local/android-sdk-linux
 ENV ANDROID_SDK_ROOT /usr/local/android-sdk-linux
 ENV CMDLINE_TOOLS_HOME $ANDROID_HOME/cmdline-tools/latest
 ENV PATH /usr/local/bin:$PATH:$CMDLINE_TOOLS_HOME/bin:$ANDROID_HOME/:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools
-ARG ANDROID_BUILD_TOOLS_VERSION=30.0.3
+ARG ANDROID_BUILD_TOOLS_VERSION=35.0.0
 
 RUN mkdir -p /usr/local/android-sdk-linux/cmdline-tools/latest && cd /usr/local/android-sdk-linux && \
-  curl -L -O  https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip && \
-  unzip -qq commandlinetools-linux-8512546_latest.zip -d tmp && mv tmp/cmdline-tools/* cmdline-tools/latest && \
-  rm -rf /usr/local/android-sdk-linux/commandlinetools-linux-8512546_latest.zip && \
+  curl -L -O  https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip && \
+  unzip -qq commandlinetools-linux-13114758_latest.zip -d tmp && mv tmp/cmdline-tools/* cmdline-tools/latest && \
+  rm -rf /usr/local/android-sdk-linux/commandlinetools-linux-13114758_latest.zip && \
   yes|/usr/local/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --licenses && \
   /usr/local/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --update && \
   /usr/local/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --list && \
@@ -40,7 +40,7 @@ RUN mkdir -p /usr/local/android-sdk-linux/cmdline-tools/latest && cd /usr/local/
                                                       "ndk;25.0.8775105" \
                                                       "extras;google;m2repository" \
                                                       "extras;android;m2repository" \
-                                                      "platforms;android-33" \
+                                                      "platforms;android-36" \
                                                       "emulator" \
                                                       "build-tools;$ANDROID_BUILD_TOOLS_VERSION" \
                                                       "add-ons;addon-google_apis-google-24" \
diff --git a/updatecli/updatecli.d/android.yaml b/updatecli/updatecli.d/android.yaml
new file mode 100644
index 00000000..0b40ac81
--- /dev/null
+++ b/updatecli/updatecli.d/android.yaml
@@ -0,0 +1,63 @@
+---
+name: Bump Android SDK components in android agent
+
+scms:
+  default:
+    kind: github
+    spec:
+      user: "{{ .github.user }}"
+      email: "{{ .github.email }}"
+      owner: "{{ .github.owner }}"
+      repository: "{{ .github.repository }}"
+      token: "{{ requiredEnv .github.token }}"
+      username: "{{ .github.username }}"
+      branch: "{{ .github.branch }}"
+
+sources:
+  androidCommandLineTools:
+    kind: shell
+    spec:
+      command: 'curl -sL https://developer.android.com/studio | grep -oP "commandlinetools-linux-\K\d+(?=_latest\.zip)" | head -1'
+      environments:
+        - name: PATH
+
+  androidBuildTools:
+    kind: shell
+    spec:
+      command: 'curl -sL https://developer.android.com/tools/releases/build-tools | grep -oP "(\d+\.\d+\.\d+)" | grep "^35\." | head -1'
+      environments:
+        - name: PATH
+
+conditions:
+
+targets:
+  androidCommandLineToolsURL:
+    name: "[android-agent] Update command-line tools version in Dockerfile"
+    kind: file
+    spec:
+      file: dockerfiles/android/Dockerfile
+      matchpattern: 'commandlinetools-linux-(\d+)_latest\.zip'
+      replacepattern: 'commandlinetools-linux-{{ source "androidCommandLineTools" }}_latest.zip'
+    sourceid: androidCommandLineTools
+    scmid: default
+
+  androidBuildToolsVersion:
+    name: "[android-agent] Update build tools version in Dockerfile"
+    kind: dockerfile
+    spec:
+      file: dockerfiles/android/Dockerfile
+      instruction:
+        keyword: "ARG"
+        matcher: "ANDROID_BUILD_TOOLS_VERSION"
+    sourceid: androidBuildTools
+    scmid: default
+
+actions:
+  default:
+    kind: github/pullrequest
+    scmid: default
+    title: '[Android] Bump Android SDK components to latest versions'
+    spec:
+      labels:
+        - dependencies
+        - android