diff --git a/.gitlab-ci-files/job-uitests.yml b/.gitlab-ci-files/job-uitests.yml
index 2f9e3a0d8..9b08c2746 100644
--- a/.gitlab-ci-files/job-uitests.yml
+++ b/.gitlab-ci-files/job-uitests.yml
@@ -1,34 +1,39 @@
 #dependencies:
 	#install 'Android SDK Command-line Tools' from Android Studio > Tools > SDK Manager > SDK Tools > Android SDK Command-line Tools
 
-
 variables:
-  android_api: 33 #android 13
+  EMULATOR_PATH: /Users/quentin/Library/Android/sdk/emulator/
+  CMD_LINE_PATH: /Users/quentin/Library/Android/sdk/cmdline-tools/latest/bin/
+  android_api: "33" #android 13
   emulator_type: apis #atd for api < 30 more efficient
-  system_architecture: arm64-v8a #x86_64 or x86 for Intels
+  system_architecture: x86_64 #arm64-v8a or x86 for Intels
   android_system_image: system-images;android-$android_api;google_$emulator_type;$system_architecture
-  emulator_device = pixel_7
+  emulator_device: pixel_6
   emulator_name: $emulator_device-api_$android_api-google_$emulator_type-arch_$system_architecture
 
+
 job-android-uitests:
 
   stage: uitests
-  tags: [ "deploy" ]
+  tags: [ "macmini-m1-bis-xcode13" ]
 
   dependencies:
     - job-android
-    
+
   before_script:
-	- sdkmanager --install $android_system_image > emulatorSystemImageInstallation.log
-	- echo no | ${AVDMANAGER_EXE} --verbose create avd --force --name $emulator_name --package $android_system_image --tag google_$emulator_type --abi $system_architecture --device emulator_device > emulatorCreation.log
-	- abd start-server
-	- emulator -avd $emulator_name """-no-window -no-audio"""& 
-	- ${WAIT_FOR_EMULATOR_EXE}
-	- adb shell input keyevent 82
+    - echo $PATH
+    - ${CMD_LINE_PATH}sdkmanager --install "$android_system_image" > emulatorSystemImageInstallation.log
+    - echo $android_system_image
+    - echo no | ${CMD_LINE_PATH}avdmanager --verbose create avd --force --name $emulator_name --package $android_system_image --tag google_$emulator_type --abi $system_architecture --device $emulator_device > emulatorCreation.log
+    - adb start-server
+    - ${EMULATOR_PATH}emulator -avd $emulator_name &
+    - wait-for-android-emulator
+    - adb shell input keyevent 82
 
   script:
-    - ./gradlew -Pandroid.testInstrumentationRunnerArguments.class=org.linphone.call.OutgoingCallUITests -PscreportAutoClose=true connectedAndroidTest
+  - ./gradlew -Pandroid.testInstrumentationRunnerArguments.class=org.linphone.call.OutgoingCallUITests -PscreportAutoClose=true connectedAndroidTest
 
   after_script:
     - adb -s emulator-5554 emu kill
-  	- adb kill-server
+    - adb -s emulator-5554 emu kill
+    - adb kill-server
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d856c455..ca9839e75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,38 +19,3 @@ stages:
  - build
  - uitests
  - deploy
-
-
-variables:
-  PATH: /Users/quentin/Library/Android/sdk/emulator/:/Users/quentin/Library/Android/sdk/cmdline-tools/latest/bin/
-  android_api: "33" #android 13
-  emulator_type: apis #atd for api < 30 more efficient
-  system_architecture: arm64-v8a #x86_64 or x86 for Intels
-  android_system_image: system-images;android-$android_api;google_$emulator_type;$system_architecture
-  emulator_device: pixel_7
-  emulator_name: $emulator_device-api_$android_api-google_$emulator_type-arch_$system_architecture
-
-
-job-android-uitests:
-
-  stage: uitests
-  tags: [ "android" ]
-
-  dependencies:
-    - job-android
-
-  before_script:
-    - echo $PATH
-    - ${PATH}sdkmanager --install $android_system_image > emulatorSystemImageInstallation.log
-    - echo no | ${PATH}avdmanager --verbose create avd --force --name $emulator_name --package $android_system_image --tag google_$emulator_type --abi $system_architecture --device emulator_device > emulatorCreation.log
-    - abd start-server
-    - ${PATH}emulator -avd $emulator_name &
-    - wait-for-android-emulator
-    - adb shell input keyevent 82
-
-  script:
-  - ./gradlew -Pandroid.testInstrumentationRunnerArguments.class=org.linphone.call.OutgoingCallUITests -PscreportAutoClose=true connectedAndroidTest
-
-  after_script:
-    - adb -s emulator-5554 emu kill
-    - adb kill-server
diff --git a/screport b/screport
index e67246c2c..e92d40e33 160000
--- a/screport
+++ b/screport
@@ -1 +1 @@
-Subproject commit e67246c2c5f4f14fd74557be79a4e4ad6c53c188
+Subproject commit e92d40e33bdb45f73b23dc28f6c53c4aabd01246