diff --git a/.gitlab-ci-files/job-android.yml b/.gitlab-ci-files/job-android.yml
index 3bb32bbf5..d6f6f9121 100644
--- a/.gitlab-ci-files/job-android.yml
+++ b/.gitlab-ci-files/job-android.yml
@@ -2,7 +2,7 @@ job-android:
 
   stage: build
   tags: [ "docker-android" ]
-  image: gitlab.linphone.org:4567/bc/public/linphone-android/bc-dev-android:20220609_android_33
+  image: gitlab.linphone.org:4567/bc/public/linphone-android/bc-dev-android-33:20230615_restore_old_image_for_5.0_builds
 
   before_script:
     - if ! [ -z ${SCP_PRIVATE_KEY+x} ]; then eval $(ssh-agent -s); fi
@@ -10,7 +10,6 @@ job-android:
     - echo "$ANDROID_SETTINGS_GRADLE" > settings.gradle
 
   script:
-    - sdkmanager
     - scp -oStrictHostKeyChecking=no $DEPLOY_SERVER:$ANDROID_KEYSTORE_PATH app/
     - scp -oStrictHostKeyChecking=no $DEPLOY_SERVER:$ANDROID_GOOGLE_SERVICES_PATH app/
     - echo storePassword=$ANDROID_KEYSTORE_PASSWORD > keystore.properties
diff --git a/docker-files/bc-dev-android-33 b/docker-files/bc-dev-android-33
index 2a15406b3..07dd92c17 100644
--- a/docker-files/bc-dev-android-33
+++ b/docker-files/bc-dev-android-33
@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:bullseye
 
 MAINTAINER Sylvain BERFINI <sylvain.berfini@belledonne-communications.com>
 
@@ -13,43 +13,36 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 ENV SHELL=/bin/bash
 
 # Define environment
-ENV ANDROID_SDK 25.2.5
 ENV ANDROID_HOME /opt/android-sdk-linux
-ENV ANDROID_NDK_HOME /opt/android-sdk-linux/ndk
-
-# Backports required for JDK 11
-RUN echo "deb http://deb.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list
 
 # Install common general tools
 RUN apt-get update && \
-    apt-get install -y curl nano sudo unzip vim wget rsync ssh git openjdk-8-jdk-headless && \
-    apt-get -t stretch-backports install -y openjdk-11-jdk-headless && \
+    apt-get install -y curl nano sudo unzip vim wget rsync ssh git openjdk-11-jdk-headless && \
     apt-get clean
 
-# Get the Android tools
-RUN wget https://dl.google.com/android/repository/tools_r$ANDROID_SDK-linux.zip && \
-    unzip tools_r$ANDROID_SDK-linux.zip -d $ANDROID_HOME && \
-    rm -f tools_r$ANDROID_SDK-linux.zip
-
-# Get latest Android command line tools, otherwise won't work with JDK 11
+# Get latest Android command line tools
 RUN mkdir -p $ANDROID_HOME/cmdline-tools/latest
-RUN wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip && \
-    unzip commandlinetools-linux-7583922_latest.zip && \
+RUN wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip && \
+    unzip commandlinetools-linux-9477386_latest.zip && \
     cp -R ./cmdline-tools/* $ANDROID_HOME/cmdline-tools/latest/ && \
     rm -rf ./cmdline-tools && \
-    rm -rf commandlinetools-linux-7583922_latest.zip
+    rm -rf commandlinetools-linux-9477386_latest.zip
 
 # Update path to include all Android SDK tools
-ENV PATH $ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools:ANDROID_NDK_HOME:$PATH
-
-# Test
-RUN $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --list --verbose --sdk_root=$ANDROID_HOME
+ENV PATH $ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools:$PATH
 
 # Get the Android SDK
-RUN echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platforms;android-33" "build-tools;33.0.0" "extras;android;m2repository" "extras;google;m2repository" "platform-tools" "tools" "ndk;21.3.6528147" --sdk_root=$ANDROID_HOME
+RUN echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platform-tools" "tools" "platforms;android-33"
 
 # Accept Android SDK licenses
-RUN yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses --sdk_root=$ANDROID_HOME
+RUN yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses
+
+# Give write rights
+RUN chmod -R ugo+rwx $ANDROID_HOME
+
+# Consider all git repositories as safe
+RUN git --version
+RUN git config --global --add safe.directory '*'
 
 # Configure user bc
 RUN useradd -ms /bin/bash bc && \