diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55f07448c..386bd7b15 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,6 +45,7 @@ variables:
   GIT_CLONE_PATH: '$CI_BUILDS_DIR/$CI_COMMIT_SHA/$CI_JOB_ID'
   YNH_SOURCE: "https://github.com/yunohost"
   YNH_DEBIAN: "bookworm"
+  YNH_SKIP_DIAGNOSIS_DURING_UPGRADE: "true"
 
 include:
   - template: Code-Quality.gitlab-ci.yml
diff --git a/debian/postinst b/debian/postinst
index 66747d5f3..4f784a516 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -31,7 +31,7 @@ do_configure() {
         yunohost tools migrations run --auto
 
         echo "Re-diagnosing server health..."
-        yunohost diagnosis run --force
+        [[ -n "${YNH_SKIP_DIAGNOSIS_DURING_UPGRADE:-}" ]] && echo "(Skipping)" || yunohost diagnosis run --force
 
         echo "Refreshing app catalog..."
         yunohost tools update apps --output-as none || true