diff --git a/add-firmware-to b/add-firmware-to
index a528a83..c26b675 100755
--- a/add-firmware-to
+++ b/add-firmware-to
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 #
 # add-firmware-to: Add non-free firmware to Debian install media
 #
@@ -25,7 +25,7 @@
 #              to add other archs upon request
 # 2008.??.?? - Initial creation, just works on initrds
 #
- 
+
 set -x
 
 is_iso() {
@@ -99,7 +99,7 @@ if [ -e "$outfile" ]; then
 fi
 
 suite="$3"
-if [ "$suite" != "stretch" ] && [ "$suite" != "jessie" ]; then
+if [ "$suite" != "buster" ] && [ "$suite" != "stretch" ]; then
     echo "Unrecognized suite $suite, trying anyway." >&2
 fi
 
@@ -130,7 +130,7 @@ if is_iso "$file"; then
     for i in $(find "$buildtree" -name "initrd.gz" -o -name "initrd.img"); do
 	initrd_append_fw "$i" "$fwfile" "$i"
     done
-    
+
     isolinuxpath="$(cd $buildtree && find . -name isolinux.bin | head -1 | cut -b 3-)"
     genisoimage -r -J -b "$isolinuxpath" -c boot.cat \
                 -no-emul-boot -boot-load-size 4 -boot-info-table \
diff --git a/auto_build.sh b/auto_build.sh
index 225a07f..b5bc610 100755
--- a/auto_build.sh
+++ b/auto_build.sh
@@ -58,7 +58,7 @@ compare_version () {
 	fi
 }
 
-deb_dist=stretch
+deb_dist=buster
 dist=stable
 compare_version "$(get_ynh_release)"
 
diff --git a/build-yunohost b/build-yunohost
index f14ec06..d342b80 100755
--- a/build-yunohost
+++ b/build-yunohost
@@ -2,9 +2,9 @@
 # Usage ./build-yunohost [ARCH [DIST [DEB_DIST]]]
 # ARCH amd64|i386
 # DIST stable|testing
-# DEB_DIST stretch
+# DEB_DIST buster
 
-readonly DEFAULT_DEB_DIST="stretch"
+readonly DEFAULT_DEB_DIST="buster"
 readonly REPO_URL="http://forge.yunohost.org/debian/"
 
 readonly ARCH_CHOICE=$1
@@ -22,9 +22,9 @@ function build
     info "Starting build for arch $ARCH ..."
 
     if [ "$DIST" = "testing" ] ; then
-        sed -i "s#$REPO_URL stretch stable#$REPO_URL $DEB_DIST stable testing#" profiles/*.preseed
+        sed -i "s#$REPO_URL buster stable#$REPO_URL $DEB_DIST stable testing#" profiles/*.preseed
     else
-        sed -i "s#$REPO_URL stretch stable testing#$REPO_URL $DEB_DIST stable#" profiles/*.preseed
+        sed -i "s#$REPO_URL buster stable testing#$REPO_URL $DEB_DIST stable#" profiles/*.preseed
     fi
 
     rm -rf $(pwd)/tmp
diff --git a/profiles/default.preseed b/profiles/default.preseed
index ba953fd..10f3c19 100644
--- a/profiles/default.preseed
+++ b/profiles/default.preseed
@@ -69,7 +69,7 @@ d-i apt-setup/services-select multiselect security, updates
 d-i apt-setup/security_host string security.debian.org
 
 d-i apt-setup/local0/repository string \
-	http://forge.yunohost.org/debian/ stretch stable
+	http://forge.yunohost.org/debian/ buster stable
 d-i apt-setup/local0/key string http://forge.yunohost.org/yunohost.asc
 d-i apt-setup/local0/comment string YunoHost repository
 #d-i debian-installer/allow_unauthenticated string true