diff --git a/README.md b/README.md
index 1260aae..5c922a9 100644
--- a/README.md
+++ b/README.md
@@ -101,13 +101,13 @@ Then test your packages :
 Install the package `qemu-user-static` and `binfmt-support`, then list of all available images :
 
 ```
-lxc image list images:debian/buster
+lxc image list images:debian/bullseye
 ```
 
 Export the image of the architecture you want to run (for example armhf):
 
 ```
-lxc image export images:debian/buster/armhf
+lxc image export images:debian/bullseye/armhf
 ```
 
 This command will create two files.
diff --git a/lib/analyze_test_results.py b/lib/analyze_test_results.py
index 499b998..0da8c34 100644
--- a/lib/analyze_test_results.py
+++ b/lib/analyze_test_results.py
@@ -136,7 +136,7 @@ def level_5(tests):
 @level(6, "App is in a community-operated git org")
 def level_6(tests):
     """
-    The app is in the Yunohost-Apps organization
+    The app is in the YunoHost-Apps organization
     (the linter will report a warning named "is_in_github_org" if it's not)
     """
 
diff --git a/lib/common.sh b/lib/common.sh
index 9663a64..65b0b1a 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Yunohost install parameters
+# YunoHost install parameters
 YUNO_PWD="admin"
 DOMAIN="domain.tld"
 SUBDOMAIN="sub.$DOMAIN"
@@ -9,9 +9,9 @@ TEST_USER="package_checker"
 [[ -e "./config" ]] && source "./config"
 
 ARCH=${ARCH:-amd64}
-DIST=${DIST:-buster}
+DIST=${DIST:-bullseye}
 
-# Yunohost version: stable, testing or unstable
+# YunoHost version: stable, testing or unstable
 YNH_BRANCH=${YNH_BRANCH:-stable}
 
 WORKER_ID=${WORKER_ID:-0}
@@ -20,8 +20,7 @@ LXC_NAME="ynh-appci-$DIST-$ARCH-$YNH_BRANCH-test-${WORKER_ID}"
 
 readonly lock_file="./pcheck-${WORKER_ID}.lock"
 
-DEFAULT_PHP_VERSION="7.3"
-[[ "$DIST" == "bullseye" ]] && DEFAULT_PHP_VERSION="7.4"
+DEFAULT_PHP_VERSION="7.4"
 
 #=================================================
 # LXC helpers
diff --git a/lib/lxc.sh b/lib/lxc.sh
index f2123fd..1c68ea2 100644
--- a/lib/lxc.sh
+++ b/lib/lxc.sh
@@ -6,7 +6,7 @@
 
 LXC_CREATE () {
     log_info "Launching new LXC $LXC_NAME ..."
-    # Check if we can launch container from yunohost remote image
+    # Check if we can launch container from YunoHost remote image
     if lxc remote list | grep -q "yunohost" && lxc image list yunohost:$LXC_BASE | grep -q -w $LXC_BASE; then
         lxc launch yunohost:$LXC_BASE $LXC_NAME \
             -c security.nesting=true \