diff --git a/debian/changelog b/debian/changelog
index 1bc60b4c9..e86830113 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -212,6 +212,19 @@ yunohost (11.0.2) testing; urgency=low
 
  -- Alexandre Aubin <alex.aubin@mailoo.org>  Wed, 19 Jan 2022 20:52:39 +0100
 
+yunohost (4.4.2.14) stable; urgency=low
+
+  - bullseye migration: remove derpy OVH repo... (76014920)
+  - bullseye migration: improve autofix procedure for the libc6 hell (02b3a138)
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Sat, 03 Sep 2022 23:19:08 +0200
+
+yunohost (4.4.2.13) stable; urgency=low
+
+  - [fix] bullseye migration: a few annoying issues related to Sury (b5fabc87)
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Mon, 29 Aug 2022 15:40:03 +0200
+
 yunohost (4.4.2.12) stable; urgency=low
 
   - bullseye migration: add trick to automagically find the likely log of a previously failed migration to ease support (f5d94509)
diff --git a/src/migrations/0021_migrate_to_bullseye.py b/src/migrations/0021_migrate_to_bullseye.py
index 690bc1249..d0ad06a9f 100644
--- a/src/migrations/0021_migrate_to_bullseye.py
+++ b/src/migrations/0021_migrate_to_bullseye.py
@@ -96,6 +96,9 @@ class MyMigration(Migration):
         logger.info(m18n.n("migration_0021_patching_sources_list"))
         self.patch_apt_sources_list()
 
+        # Stupid OVH has some repo configured which dont work with bullseye and break apt ...
+        os.system("sudo rm -f /etc/apt/sources.list.d/ovh-*.list")
+
         # Force add sury if it's not there yet
         # This is to solve some weird issue with php-common breaking php7.3-common,
         # hence breaking many php7.3-deps
@@ -106,9 +109,17 @@ class MyMigration(Migration):
             open("/etc/apt/sources.list.d/extra_php_version.list", "w").write(
                 "deb https://packages.sury.org/php/ bullseye main"
             )
-            os.system(
-                'wget --timeout 900 --quiet "https://packages.sury.org/php/apt.gpg" --output-document=- | gpg --dearmor >"/etc/apt/trusted.gpg.d/extra_php_version.gpg"'
-            )
+
+        # Add Sury key even if extra_php_version.list was already there,
+        # because some old system may be using an outdated key not valid for Bullseye
+        # and that'll block the migration
+        os.system(
+            'wget --timeout 900 --quiet "https://packages.sury.org/php/apt.gpg" --output-document=- | gpg --dearmor >"/etc/apt/trusted.gpg.d/extra_php_version.gpg"'
+        )
+
+        # Remove legacy, duplicated sury entry if it exists
+        if os.path.exists("/etc/apt/sources.list.d/sury.list"):
+            os.system("rm -rf /etc/apt/sources.list.d/sury.list")
 
         #
         # Get requirements of the different venvs from python apps
@@ -225,8 +236,8 @@ class MyMigration(Migration):
                 "LC_ALL=C DEBIAN_FRONTEND=noninteractive APT_LISTCHANGES_FRONTEND=none apt autoremove --assume-yes"
             )
             self.apt_install(
-                "gcc-8- libgcc-8-dev-"
-            )  # Note the '-' suffix to mean that we actually want to remove the packages
+                "gcc-8- libgcc-8-dev- equivs"
+            )  # Note the '-' suffix to mean that we actually want to remove the packages .. we also explicitly add 'equivs' to the list because sometimes apt is dumb and will derp about it
 
         #
         # Main upgrade