diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml
index 07fd8e5a4..0bdbbcb7b 100644
--- a/.github/workflows/Android-CI.yml
+++ b/.github/workflows/Android-CI.yml
@@ -81,8 +81,8 @@ jobs:
         run: |
           ls -ls app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected
           cp app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/emulator-5554\ -\ ${{ matrix.emulatorApi }}/* screenshotsToCompare${{ matrix.emulatorApi }}
-          export DISPLAY=:99
-          sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
+          set -x
+          ./screenShotScript/prepareTerminal.sh
           ./screenShotScript/screenShotCompare.sh
       - name: Archive screenshots diffs
         if: ${{ always() }}
diff --git a/screenShotScript b/screenShotScript
index 15a81a751..7becd24b6 160000
--- a/screenShotScript
+++ b/screenShotScript
@@ -1 +1 @@
-Subproject commit 15a81a751b299ca7b131a2481dac1a81885438c9
+Subproject commit 7becd24b60402f654962c8bb02f8497dc1f0f5ec