diff --git a/.github/workflows/ecode-nightly.yml b/.github/workflows/ecode-nightly.yml
index f4308da4e..e6b7d1436 100644
--- a/.github/workflows/ecode-nightly.yml
+++ b/.github/workflows/ecode-nightly.yml
@@ -77,23 +77,41 @@ jobs:
       - name: Install dependencies
         shell: bash
         run: |
-          apt-get install -y curl libfuse2 fuse premake4 mesa-common-dev libgl1-mesa-dev sudo file appstream libdw-dev
+          apt-get install -y curl libfuse2 fuse premake4 mesa-common-dev libgl1-mesa-dev sudo file appstream
           curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
           apt-get install -y nodejs
           add-apt-repository -y universe
           add-apt-repository -y multiverse
 
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          ./llvm.sh 20
+          SUCCESS=false
+          for i in {1..3}; do
+            echo "Attempt $i: Adding PPA via Launchpad API..."
+            if timeout 30s sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; then
+              SUCCESS=true
+              echo "Successfully added PPA."
+              break
+            fi
+            echo "Launchpad API failed or timed out. Retrying in 5 seconds..."
+            sleep 5
+          done
 
-          apt-get install -y libc++-20-dev libc++abi-20-dev
-
-          update-alternatives --install /usr/bin/cc cc /usr/bin/clang-20 30
-          update-alternatives --set cc /usr/bin/clang-20
-          update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-20 30
-          update-alternatives --set c++ /usr/bin/clang++-20
+          if [ "$SUCCESS" = false ]; then
+            echo "add-apt-repository failed 3 times. Executing manual fallback..."
+            . /etc/os-release
+            echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu $VERSION_CODENAME main" | sudo tee /etc/apt/sources.list.d/ubuntu-toolchain-r-fallback.list
+            sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 60C317803A41BA51845E371A1E9377A2BA9EF27F || true
+          fi
 
+          sudo apt-get update
+          apt-get install -y gcc-13 g++-13 libdw-dev
+          update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 10
+          update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 10
+          update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 30
+          update-alternatives --set cc /usr/bin/gcc
+          update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 30
+          update-alternatives --set c++ /usr/bin/g++
+          update-alternatives --config gcc
+          update-alternatives --config g++
           bash projects/linux/scripts/install_sdl2.sh
       - name: Build ecode
         run: |
diff --git a/src/tests/unit_tests/uihtml_tests.cpp b/src/tests/unit_tests/uihtml_tests.cpp
index 51f94df75..5169688b3 100644
--- a/src/tests/unit_tests/uihtml_tests.cpp
+++ b/src/tests/unit_tests/uihtml_tests.cpp
@@ -1605,7 +1605,7 @@ UTEST( UIBorder, renderingVariations ) {
 	SceneManager::instance()->draw();
 	win->display();
 
-	compareImages( utest_state, utest_result, win, "eepp-ui-border-rendering", "html", 4 );
+	compareImages( utest_state, utest_result, win, "eepp-ui-border-rendering", "html", 12 );
 
 	Engine::destroySingleton();
 }
@@ -1639,7 +1639,7 @@ UTEST( UIBorder, renderingVariations2 ) {
 	SceneManager::instance()->draw();
 	win->display();
 
-	compareImages( utest_state, utest_result, win, "eepp-ui-border-rendering-2", "html", 4 );
+	compareImages( utest_state, utest_result, win, "eepp-ui-border-rendering-2", "html", 12 );
 
 	Engine::destroySingleton();
 }