diff --git a/tutor/templates/android/tutor.yaml b/tutor/templates/android/tutor.yaml
index d89848b0be2f66de7682f32d2cbf351e7def8c0c..7254d7ecb93d9727c11408e6f2b2bb48716524e5 100644
--- a/tutor/templates/android/tutor.yaml
+++ b/tutor/templates/android/tutor.yaml
@@ -1,3 +1,4 @@
+# See docs: https://openedx.atlassian.net/wiki/spaces/LEARNER/pages/48792067/App+Configuration+Flags
 API_HOST_URL: '{{ "https" if ACTIVATE_HTTPS else "http" }}://{{ LMS_HOST }}'
 ENVIRONMENT_DISPLAY_NAME: 'tutor'
 PLATFORM_NAME: '{{ PLATFORM_NAME }}'
diff --git a/tutor/templates/build/android/Dockerfile b/tutor/templates/build/android/Dockerfile
index 016aea45ed9502de4d91269c34044a3d838f4d0e..afc9f7bd5ece46d04036326767b6f1d75dfcfeed 100644
--- a/tutor/templates/build/android/Dockerfile
+++ b/tutor/templates/build/android/Dockerfile
@@ -9,22 +9,23 @@ RUN mkdir /openedx
 
 # Install Android SDK
 # Inspired from https://github.com/LiveXP/docker-android-sdk/blob/master/Dockerfile
-ENV ANDROID_SDK_VERSION 4333796
+ENV ANDROID_SDK_VERSION 6200805
 ENV ANDROID_SDK_PATH /openedx/android-sdk
 ENV ANDROID_HOME /openedx/android-sdk
-RUN mkdir /openedx/android-sdk
+RUN mkdir ${ANDROID_HOME}
 WORKDIR /openedx/android-sdk
-RUN wget https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_VERSION}.zip && \
-    unzip sdk-tools-linux-${ANDROID_SDK_VERSION}.zip && \
-    rm sdk-tools-linux-${ANDROID_SDK_VERSION}.zip
+RUN wget https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip && \
+    unzip commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip && \
+    rm commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip
 
 # Accept licenses
 # https://developer.android.com/studio/command-line/sdkmanager
-RUN yes | /openedx/android-sdk/tools/bin/sdkmanager "platforms;android-27" 1> /dev/null
+ARG ANDROID_API_LEVEL=28
+RUN yes | /openedx/android-sdk/tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install "platforms;android-$ANDROID_API_LEVEL" 1> /dev/null
 
 # Install android app repo
 ARG ANDROID_APP_REPOSITORY=https://github.com/edx/edx-app-android
-ARG ANDROID_APP_VERSION=release/2.20.2
+ARG ANDROID_APP_VERSION=release/2.21.1
 RUN git clone $ANDROID_APP_REPOSITORY --branch $ANDROID_APP_VERSION /openedx/edx-app-android
 WORKDIR /openedx/edx-app-android