diff --git a/config/bootstrap b/config/bootstrap
index f713235..544ed12 100644
--- a/config/bootstrap
+++ b/config/bootstrap
@@ -5,24 +5,8 @@
 LB_DISTRIBUTION="buster"
 
 # $LB_PARENT_DISTRIBUTION: select parent distribution to use
-# (Default: )
-LB_PARENT_DISTRIBUTION=""
-
-# $LB_DISTRIBUTION_CHROOT: select distribution to use in the chroot
 # (Default: buster)
-LB_DISTRIBUTION_CHROOT="buster"
-
-# $LB_PARENT_DISTRIBUTION_CHROOT: select parent distribution to use in the chroot
-# (Default: buster)
-LB_PARENT_DISTRIBUTION_CHROOT="buster"
-
-# $LB_DISTRIBUTION_BINARY: select distribution to use in the final image
-# (Default: buster)
-LB_DISTRIBUTION_BINARY="buster"
-
-# $LB_PARENT_DISTRIBUTION_BINARY: select parent distribution to use in the final image
-# (Default: buster)
-LB_PARENT_DISTRIBUTION_BINARY="buster"
+LB_PARENT_DISTRIBUTION="buster"
 
 # $LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION: select parent distribution for debian-installer to use
 # (Default: buster)
diff --git a/config/build b/config/build
index 4d5445a..2007f26 100644
--- a/config/build
+++ b/config/build
@@ -1,8 +1,7 @@
 [Image]
 Architecture: amd64
 Archive-Areas: main contrib non-free
-Distribution-Chroot: buster
-Distribution-Binary: buster
+Distribution: buster
 Mirror-Bootstrap: http://deb.debian.org/debian/
 
 [FIXME]
diff --git a/config/chroot b/config/chroot
index 6dbf7d0..74ca89e 100644
--- a/config/chroot
+++ b/config/chroot
@@ -17,16 +17,8 @@ LB_INTERACTIVE="false"
 LB_KEYRING_PACKAGES="debian-archive-keyring"
 
 # $LB_LINUX_FLAVOURS: set kernel flavour to use
-# This is kept for backwards compatibility
 # (Default: autodetected)
-if [ -n " amd64" ]
-then
-	LB_LINUX_FLAVOURS_WITH_ARCH=" amd64"
-fi
-
-# $LB_LINUX_FLAVOURS_WITH_ARCH: set kernel flavour to use (with arch)
-# (Default: autodetected)
-LB_LINUX_FLAVOURS_WITH_ARCH="amd64"
+LB_LINUX_FLAVOURS="amd64"
 
 # $LB_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
diff --git a/config/common b/config/common
index 2662c13..38a929f 100644
--- a/config/common
+++ b/config/common
@@ -87,32 +87,26 @@ LB_TASKSEL="apt"
 # live-build options
 
 # $_BREAKPOINTS: enable breakpoints
-# If set here, overrides the command line option
 # (Default: false)
 #_BREAKPOINTS="false"
 
 # $_DEBUG: enable debug
-# If set here, overrides the command line option
 # (Default: false)
 #_DEBUG="false"
 
 # $_COLOR: enable color
-# If set here, overrides the command line option
 # (Default: false)
 #_COLOR="false"
 
 # $_FORCE: enable force
-# If set here, overrides the command line option
 # (Default: false)
 #_FORCE="false"
 
 # $_QUIET: enable quiet
-# If set here, overrides the command line option
 # (Default: false)
-#_QUIET="false"
+_QUIET="false"
 
 # $_VERBOSE: enable verbose
-# If set here, overrides the command line option
 # (Default: false)
 #_VERBOSE="false"