diff --git a/app/build.gradle b/app/build.gradle
index e13f88330..6d2a2dd79 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,8 +48,7 @@ task getGitVersion() {
 }
 
 configurations {
-    customImplementation
-    implementation.extendsFrom(customImplementation)
+    customImplementation.extendsFrom implementation
 }
 
 task linphoneSdkSource() {
diff --git a/docker-files/bc-dev-android-30 b/docker-files/bc-dev-android-30
index ad77a587d..049f0b860 100644
--- a/docker-files/bc-dev-android-30
+++ b/docker-files/bc-dev-android-30
@@ -30,7 +30,7 @@ RUN wget https://dl.google.com/android/repository/tools_r$ANDROID_SDK-linux.zip
 ENV PATH $ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools:ANDROID_NDK_HOME:$PATH
 
 # Get the Android SDK
-RUN echo "y" | sdkmanager "platforms;android-30" "build-tools;30.0.2" "extras;android;m2repository" "extras;google;m2repository" "platform-tools" "tools" "ndk;21.3.6528147"
+RUN echo "y" | sdkmanager "platforms;android-30" "build-tools;30.0.3" "extras;android;m2repository" "extras;google;m2repository" "platform-tools" "tools" "ndk;21.3.6528147"
 
 # Accept Android SDK licenses
 RUN yes | sdkmanager --licenses
@@ -38,7 +38,7 @@ RUN yes | sdkmanager --licenses
 # Update if needed
 RUN echo y | android update sdk --no-ui --all --filter platform-tools
 RUN echo y | android update sdk --no-ui --all --filter android-30
-RUN echo y | android update sdk --no-ui --all --filter build-tools-30.0.2
+RUN echo y | android update sdk --no-ui --all --filter build-tools-30.0.3
 
 # Configure user bc
 RUN useradd -ms /bin/bash bc && \