diff --git a/components/init b/components/init
index 969cc1694..08bd9d20a 100755
--- a/components/init
+++ b/components/init
@@ -41,21 +41,42 @@ def main():
 		formatter_class = argparse.ArgumentDefaultsHelpFormatter
 	)
 
-	arguments.add_argument('--version',                 help='show program\'s version number and exit', action='version', version='live-build 4')
-	arguments.add_argument('--verbose',                 help='set verbose option',                      action='store_true')
+	arguments.add_argument('--version',                       help='show program\'s version number and exit', action='version', version='live-build 4')
+	arguments.add_argument('--verbose',                       help='set verbose option',                      action='store_true')
 
-	arguments.add_argument('--project',                 help='set project defaults',                    default='debian')
-	arguments.add_argument('--system',                  help='set system type',                         default='live')
-	arguments.add_argument('--architecture',            help='set system architecture',                 default=architecture)
+	arguments.add_argument('--project',                       help='set project defaults',                    default='debian')
+	arguments.add_argument('--system',                        help='set system type',                         default='live')
+	arguments.add_argument('--architecture',                  help='set system architecture',                 default=architecture)
 
-	arguments.add_argument('--archive-areas',           help='set default archive areas',               default='main')
-	arguments.add_argument('--parent-archive-areas',    help='set default parent archive areas',        default='main')
+	arguments.add_argument('--archive-areas',                 help='set default archive areas',               default='main')
+	arguments.add_argument('--parent-archive-areas',          help='set default parent archive areas',        default='main')
 
-	arguments.add_argument('--distribution',            help='set default distribution',                default='jessie')
-	arguments.add_argument('--parent-distribution',     help='set default parent distribution',         default='jessie')
+	arguments.add_argument('--distribution',                  help='set default distribution',                default='jessie')
+	arguments.add_argument('--parent-distribution',           help='set default parent distribution',         default='jessie')
 
-	arguments.add_argument('--mirror-bootstrap',        help='set default bootstrap mirror',            default='http://ftp.debian.org/debian')
-	arguments.add_argument('--parent-mirror-bootstrap', help='set default parent bootstrap mirror',     default='http://ftp.debian.org/debian')
+	arguments.add_argument('--mirror-bootstrap',              help='set default bootstrap mirror',            default='http://ftp.debian.org/debian')
+	arguments.add_argument('--parent-mirror-bootstrap',       help='set default parent bootstrap mirror',     default='http://ftp.debian.org/debian')
+
+	arguments.add_argument('--mirror-chroot',                 help='set default chroot mirror',               default='http://ftp.debian.org/debian')
+	arguments.add_argument('--parent-mirror-chroot',          help='set default parent chroot mirror',        default='http://ftp.debian.org/debian')
+
+	arguments.add_argument('--mirror-chroot-security',        help='set default chroot mirror',               default='http://security.debian.org')
+	arguments.add_argument('--parent-mirror-chroot-security', help='set default parent chroot mirror',        default='http://security.debian.org')
+
+	arguments.add_argument('--mirror-installer',              help='set default installer mirror',            default='http://ftp.debian.org/debian')
+	arguments.add_argument('--parent-mirror-installer',       help='set default parent installer mirror',     default='http://ftp.debian.org/debian')
+
+	arguments.add_argument('--mirror-binary',                 help='set default binary mirror',               default='http://ftp.debian.org/debian')
+	arguments.add_argument('--parent-mirror-binary',          help='set default parent binary mirror',        default='http://ftp.debian.org/debian')
+
+	arguments.add_argument('--mirror-binary-security',        help='set default binary mirror',               default='http://security.debian.org')
+	arguments.add_argument('--parent-mirror-binary-security', help='set default parent binary mirror',        default='http://security.debian.org')
+
+	arguments.add_argument('--mirror-source',                 help='set default source mirror',               default='http://ftp.debian.org/debian')
+	arguments.add_argument('--parent-mirror-source',          help='set default parent source mirror',        default='http://ftp.debian.org/debian')
+
+	arguments.add_argument('--mirror-source-security',        help='set default source mirror',               default='http://security.debian.org')
+	arguments.add_argument('--parent-mirror-source-security', help='set default parent source mirror',        default='http://security.debian.org')
 
 	args = arguments.parse_args()
 
@@ -89,6 +110,48 @@ def main():
 	# --parent-mirror-bootstrap
 	parent_mirror_bootstrap = args.parent_mirror_bootstrap
 
+	# --mirror-chroot
+	mirror_chroot = args.mirror_chroot
+
+	# --parent-mirror-chroot
+	parent_mirror_chroot = args.parent_mirror_chroot
+
+	# --mirror-chroot-security
+	mirror_chroot_security = args.mirror_chroot_security
+
+	# --parent-mirror-chroot-security
+	parent_mirror_chroot_security = args.parent_mirror_chroot_security
+
+	# --mirror-installer
+	mirror_installer = args.mirror_installer
+
+	# --parent-mirror-installer
+	parent_mirror_installer = args.parent_mirror_installer
+
+	# --mirror-binary
+	mirror_binary = args.mirror_binary
+
+	# --parent-mirror-binary
+	parent_mirror_binary = args.parent_mirror_binary
+
+	# --mirror-binary-security
+	mirror_binary_security = args.mirror_binary_security
+
+	# --parent-mirror-binary-security
+	parent_mirror_binary_security = args.parent_mirror_binary_security
+
+	# --mirror-source
+	mirror_source = args.mirror_source
+
+	# --parent-mirror-source
+	parent_mirror_source = args.parent_mirror_source
+
+	# --mirror-source-security
+	mirror_source_security = args.mirror_source_security
+
+	# --parent-mirror-source-security
+	parent_mirror_source_security = args.parent_mirror_source_security
+
 	## Setting defaults
 
 	if not system:
@@ -131,6 +194,27 @@ def main():
 		# parent-mirror-bootstrap
 		parent_mirror_bootstrap = mirror_bootstrap
 
+		# parent-mirror-chroot
+		parent_mirror_chroot = mirror_chroot
+
+		# parent-mirror-chroot-security
+		parent_mirror_chroot_security = mirror_chroot_security
+
+		# parent-mirror-installer
+		parent_mirror_installer = mirror_installer
+
+		# parent-mirror-binary
+		parent_mirror_binary = mirror_binary
+
+		# parent-mirror-binary-security
+		parent_mirror_binary_security = mirror_binary_security
+
+		# parent-mirror-source
+		parent_mirror_source = mirror_source
+
+		# parent-mirror-source-security
+		parent_mirror_source_security = mirror_source_security
+
 	## Creating configuration directory
 
 	# stagefile
@@ -163,19 +247,40 @@ def main():
 
 	config.add_section('build')
 
-	config.set('build','Architecture',            architecture)
+	config.set('build','Architecture',                  architecture)
 
-	config.set('build','Archive-Areas',           archive_areas)
-	config.set('build','Parent-Archive-Areas',    parent_archive_areas)
+	config.set('build','Archive-Areas',                 archive_areas)
+	config.set('build','Parent-Archive-Areas',          parent_archive_areas)
 
-	config.set('build','Distribution',            distribution)
-	config.set('build','Parent-Distribution',     parent_distribution)
+	config.set('build','Distribution',                  distribution)
+	config.set('build','Parent-Distribution',           parent_distribution)
 
-	config.set('build','Mirror-Bootstrap',        mirror_bootstrap)
-	config.set('build','Parent-Mirror-Bootstrap', parent_mirror_bootstrap)
+	config.set('build','Mirror-Bootstrap',              mirror_bootstrap)
+	config.set('build','Parent-Mirror-Bootstrap',       parent_mirror_bootstrap)
 
-	config.set('build','Project',                 project)
-	config.set('build','System',                  system)
+	config.set('build','Mirror-Chroot',                 mirror_chroot)
+	config.set('build','Parent-Mirror-Chroot',          parent_mirror_chroot)
+
+	config.set('build','Mirror-Chroot-Security',        mirror_chroot_security)
+	config.set('build','Parent-Mirror-Chroot-Security', parent_mirror_chroot_security)
+
+	config.set('build','Mirror-Installer',              mirror_installer)
+	config.set('build','Parent-Mirror-Installer',       parent_mirror_installer)
+
+	config.set('build','Mirror-Binary',                 mirror_binary)
+	config.set('build','Parent-Mirror-Binary',          parent_mirror_binary)
+
+	config.set('build','Mirror-Binary-Security',        mirror_binary_security)
+	config.set('build','Parent-Mirror-Binary-Security', parent_mirror_binary_security)
+
+	config.set('build','Mirror-Source',                 mirror_source)
+	config.set('build','Parent-Mirror-Source',          parent_mirror_source)
+
+	config.set('build','Mirror-Source-Security',        mirror_source_security)
+	config.set('build','Parent-Mirror-Source-Security', parent_mirror_source_security)
+
+	config.set('build','Project',                       project)
+	config.set('build','System',                        system)
 
 	config.add_section('meta')
 
diff --git a/functions/defaults.sh b/functions/defaults.sh
index feebdeef5..05524c360 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -10,74 +10,67 @@
 
 New_configuration ()
 {
-	## Runtime
-
-	# Image: Architecture
-	if [ -x "/usr/bin/dpkg" ]
-	then
-		CURRENT_IMAGE_ARCHITECTURE="$(dpkg --print-architecture)"
-	else
-		case "$(uname -m)" in
-			x86_64)
-				CURRENT_IMAGE_ARCHITECTURE="amd64"
-				;;
-
-			i?86)
-				CURRENT_IMAGE_ARCHITECTURE="i386"
-				;;
-
-			*)
-				Echo_warning "Unable to determine current architecture, using ${CURRENT_IMAGE_ARCHITECTURE}"
-				;;
-		esac
-	fi
-
-
-	## Configuration
-
-	# Configuration-Version
-	LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-$(Get_configuration config/build Configuration-Version)}"
-	LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-${LIVE_BUILD_VERSION}}"
+	# Version
+	LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-$(Get_configuration config/build.conf Version)}"
 	export LIVE_CONFIGURATION_VERSION
 
-	# Image: Name
-	LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-$(Get_configuration config/build Name)}"
-	LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-live-image}"
+	# Name
+	LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-$(Get_configuration config/build.conf Name)}"
+	LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-live-image}" # FIXME
 	export LIVE_IMAGE_NAME
 
-	# Image: Architecture (FIXME: Support and default to 'any')
-	LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/build Architecture)}"
-	LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-${CURRENT_IMAGE_ARCHITECTURE}}"
+	# Architecture (FIXME: Support and default to 'any')
+	LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/build.conf Architecture)}"
 	export LIVE_IMAGE_ARCHITECTURE
 
-	# Image: Archive Areas
-	LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/build Archive-Areas)}"
-
-	case "${LB_MODE}" in
-		progress-linux)
-			LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main contrib non-free}"
-			;;
-
-		ubuntu)
-			LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main restricted}"
-			;;
-
-		*)
-			LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main}"
-			;;
-	esac
-
+	# Archive Areas
+	LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/build.conf Archive-Areas)}"
 	export LIVE_IMAGE_ARCHIVE_AREAS
 
-	# Image: Archive Areas
-	LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/build Parent-Archive-Areas)}"
-	LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-${LIVE_IMAGE_ARCHIVE_AREAS}}"
+	# Archive Areas
+	LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/build.conf Parent-Archive-Areas)}"
 	export LIVE_IMAGE_PARENT_ARCHIVE_AREAS
 
-	# Image: Type
-	LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-$(Get_configuration config/build Type)}"
-	LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}"
+	# Type
+	LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-$(Get_configuration config/build.conf Type)}"
 	export LIVE_IMAGE_TYPE
+
+	# Mirrors
+	LB_MIRROR_BOOTSTRAP="$(Get_configuration config/build.conf Mirror-Bootstrap)"
+	export LB_MIRROR_BOOTSTRAP
+
+	LB_PARENT_MIRROR_BOOTSTRAP="$(Get_configuration config/build.conf Parent-Mirror-Bootstrap)"
+	export LB_PARENT_MIRROR_BOOTSTRAP
+
+	LB_MIRROR_CHROOT="$(Get_configuration config/build.conf Mirror-Chroot)"
+	export LB_MIRROR_CHROOT
+
+	LB_PARENT_MIRROR_CHROOT="$(Get_configuration config/build.conf Parent-Mirror-Chroot)"
+	export LB_MIRROR_CHROOT
+
+	LB_MIRROR_CHROOT_SECURITY="$(Get_configuration config/build.conf Mirror-Chroot-Security)"
+	export LB_MIRROR_CHROOT_SECURITY
+
+	LB_PARENT_MIRROR_CHROOT_SECURITY="$(Get_configuration config/build.conf Parent-Mirror-Chroot-Security)"
+	export LB_PARENT_MIRROR_CHROOT_SECURITY
+
+	LB_MIRROR_BINARY="$(Get_configuration config/build.conf Mirror-Binary)"
+	export LB_MIRROR_BINARY
+
+	LB_PARENT_MIRROR_BINARY="$(Get_configuration config/build.conf Parent-Mirror-Binary)"
+	export LB_PARENT_MIRROR_BINARY
+
+	LB_MIRROR_BINARY_SECURITY="$(Get_configuration config/build.conf Mirror-Binary-Security)"
+	export LB_MIRROR_BINARY_SECURITY
+
+	LB_PARENT_MIRROR_BINARY_SECURITY="$(Get_configuration config/build.conf Parent-Mirror-Binary-Security)"
+	export LB_PARENT_MIRROR_BINARY_SECURITY
+
+	LB_MIRROR_DEBIAN_INSTALLER="$(Get_configuration config/build.conf Mirror-Installer)"
+	export LB_MIRROR_DEBIAN_INSTALLER
+
+	LB_PARENT_MIRROR_DEBIAN_INSTALLER="$(Get_configuration config/build.conf Parent-Mirror-Installer)"
+	export LB_PARENT_MIRROR_DEBIAN_INSTALLER
 }
 
 Set_defaults ()
@@ -370,129 +363,6 @@ Set_defaults ()
 
 	## config/bootstrap
 
-	# Setting mirror to fetch packages from
-	case "${LB_MODE}" in
-		debian)
-			LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://ftp.debian.org/debian/}"
-			LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}"
-			;;
-
-		progress-linux)
-			LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ftp.debian.org/debian/}"
-			LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/packages/}"
-			;;
-
-		ubuntu)
-			case "${LIVE_IMAGE_ARCHITECTURE}" in
-				amd64|i386)
-					LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.ubuntu.com/ubuntu/}"
-					;;
-
-				*)
-					LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://ports.ubuntu.com/ubuntu-ports/}"
-					;;
-			esac
-
-			LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}"
-			;;
-	esac
-
-	LB_PARENT_MIRROR_CHROOT="${LB_PARENT_MIRROR_CHROOT:-${LB_PARENT_MIRROR_BOOTSTRAP}}"
-	LB_MIRROR_CHROOT="${LB_MIRROR_CHROOT:-${LB_MIRROR_BOOTSTRAP}}"
-
-	# Setting security mirror to fetch packages from
-	case "${LB_MODE}" in
-		debian)
-			LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.debian.org/}"
-			LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT_SECURITY}}"
-			;;
-
-		progress-linux)
-			LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://security.debian.org/}"
-			LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT}}"
-			;;
-
-		ubuntu)
-			case "${LIVE_IMAGE_ARCHITECTURE}" in
-				amd64|i386)
-					LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.ubuntu.com/ubuntu/}"
-					;;
-
-				*)
-					LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://ports.ubuntu.com/ubuntu-ports/}"
-					;;
-			esac
-
-			LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT_SECURITY}}"
-			;;
-	esac
-
-	# Setting mirror which ends up in the image
-	case "${LB_MODE}" in
-		debian)
-			LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://http.debian.net/debian/}"
-			LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}"
-			;;
-
-		progress-linux)
-			LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://ftp.debian.org/debian/}"
-			LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-${LB_MIRROR_CHROOT}}"
-			;;
-
-		ubuntu)
-			case "${LIVE_IMAGE_ARCHITECTURE}" in
-				amd64|i386)
-					LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://archive.ubuntu.com/ubuntu/}"
-				;;
-
-				*)
-					LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://ports.ubuntu.com/ubuntu-ports/}"
-					;;
-			esac
-
-			LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}"
-			;;
-	esac
-
-	# Setting security mirror which ends up in the image
-	case "${LB_MODE}" in
-		debian)
-			LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.debian.org/}"
-			LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-${LB_MIRROR_BINARY_SECURITY}}"
-			;;
-
-		progress-linux)
-			LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://security.debian.org/}"
-			LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-${LB_MIRROR_CHROOT}}"
-			;;
-
-		ubuntu)
-			case "${LIVE_IMAGE_ARCHITECTURE}" in
-				amd64|i386)
-					LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.ubuntu.com/ubuntu/}"
-					;;
-
-				*)
-					LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://ports.ubuntu.com/ubuntu-ports/}"
-					;;
-			esac
-
-			LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-${LB_MIRROR_BINARY_SECURITY}}"
-			;;
-	esac
-
-	case "${LB_MODE}" in
-		progress-linux)
-			LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_CHROOT}}"
-			LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_CHROOT}}"
-			;;
-
-		*)
-			LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_CHROOT}}"
-			LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER:-${LB_PARENT_MIRROR_CHROOT}}"
-			;;
-	esac
-
 	## config/chroot
 
 	# Setting chroot filesystem
diff --git a/scripts/build/config b/scripts/build/config
index c666765a0..885b1506a 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -79,18 +79,6 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--linux-packages \"PACKAGES\"]\n\
 \t    [--losetup losetup|losetup.orig]\n\
 \t    [--memtest memtest86+|memtest86|none]\n\
-\t    [-m|--parent-mirror-bootstrap URL]\n\
-\t    [--parent-mirror-chroot URL]\n\
-\t    [--parent-mirror-chroot-security URL]\n\
-\t    [--parent-mirror-binary URL]\n\
-\t    [--parent-mirror-binary-security URL]\n\
-\t    [--parent-mirror-debian-installer URL]\n\
-\t    [--mirror-bootstrap URL]\n\
-\t    [--mirror-chroot URL]\n\
-\t    [--mirror-chroot-security URL]\n\
-\t    [--mirror-binary URL]\n\
-\t    [--mirror-binary-security URL]\n\
-\t    [--mirror-debian-installer URL]\n\
 \t    [--mode debian|ubuntu]\n\
 \t    [--system live|normal]\n\
 \t    [--net-root-filesystem nfs|cfs]\n\
@@ -129,10 +117,7 @@ Local_arguments ()
 		cache-stages:,debconf-frontend:,debconf-priority:,dump,
 		initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,tasksel:,
 		templates:,clean,
-		parent-debian-installer-distribution:,parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-binary:,
-		parent-mirror-binary-security:,parent-mirror-debian-installer:,
-		mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:,
-		mirror-binary-security:,mirror-debian-installer:,
+		parent-debian-installer-distribution:,
 		chroot-filesystem:,
 		gzip-options:,image-name:,interactive:,keyring-packages:,linux-flavours:,linux-packages:,
 		security:,updates:,backports:,binary-filesystem:,binary-images:,
@@ -342,67 +327,6 @@ Local_arguments ()
 				shift 2
 				;;
 
-			# config/bootstrap
-			-m|--parent-mirror-bootstrap)
-				LB_PARENT_MIRROR_BOOTSTRAP="${2}"
-				shift 2
-				;;
-
-			--parent-mirror-chroot)
-				LB_PARENT_MIRROR_CHROOT="${2}"
-				shift 2
-				;;
-
-			--parent-mirror-chroot-security)
-				LB_PARENT_MIRROR_CHROOT_SECURITY="${2}"
-				shift 2
-				;;
-
-			--parent-mirror-binary)
-				LB_PARENT_MIRROR_BINARY="${2}"
-				shift 2
-				;;
-
-			--parent-mirror-binary-security)
-				LB_PARENT_MIRROR_BINARY_SECURITY="${2}"
-				shift 2
-				;;
-
-			--parent-mirror-debian-installer)
-				LB_PARENT_MIRROR_DEBIAN_INSTALLER="${2}"
-				shift 2
-				;;
-
-			--mirror-bootstrap)
-				LB_MIRROR_BOOTSTRAP="${2}"
-				shift 2
-				;;
-
-			--mirror-chroot)
-				LB_MIRROR_CHROOT="${2}"
-				shift 2
-				;;
-
-			--mirror-chroot-security)
-				LB_MIRROR_CHROOT_SECURITY="${2}"
-				shift 2
-				;;
-
-			--mirror-binary)
-				LB_MIRROR_BINARY="${2}"
-				shift 2
-				;;
-
-			--mirror-binary-security)
-				LB_MIRROR_BINARY_SECURITY="${2}"
-				shift 2
-				;;
-
-			--mirror-debian-installer)
-				LB_MIRROR_DEBIAN_INSTALLER="${2}"
-				shift 2
-				;;
-
 			# config/chroot
 			--chroot-filesystem)
 				LB_CHROOT_FILESYSTEM="${2}"
@@ -1008,54 +932,6 @@ LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION}"
 # (Default: ${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION})
 LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"
 
-# \$LB_PARENT_MIRROR_BOOTSTRAP: set parent mirror to bootstrap from
-# (Default: ${LB_PARENT_MIRROR_BOOTSTRAP})
-LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP}"
-
-# \$LB_PARENT_MIRROR_CHROOT: set parent mirror to fetch packages from
-# (Default: ${LB_PARENT_MIRROR_CHROOT})
-LB_PARENT_MIRROR_CHROOT="${LB_PARENT_MIRROR_CHROOT}"
-
-# \$LB_PARENT_MIRROR_CHROOT_SECURITY: set security parent mirror to fetch packages from
-# (Default: ${LB_PARENT_MIRROR_CHROOT_SECURITY})
-LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY}"
-
-# \$LB_PARENT_MIRROR_BINARY: set parent mirror which ends up in the image
-# (Default: ${LB_PARENT_MIRROR_BINARY})
-LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY}"
-
-# \$LB_PARENT_MIRROR_BINARY_SECURITY: set security parent mirror which ends up in the image
-# (Default: ${LB_PARENT_MIRROR_BINARY_SECURITY})
-LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY}"
-
-# \$LB_PARENT_MIRROR_DEBIAN_INSTALLER: set debian-installer parent mirror
-# (Default: ${LB_PARENT_MIRROR_BOOTSTRAP})
-LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}"
-
-# \$LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from
-# (Default: ${LB_MIRROR_BOOTSTRAP})
-LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP}"
-
-# \$LB_MIRROR_CHROOT: set mirror to fetch packages from
-# (Default: ${LB_MIRROR_CHROOT})
-LB_MIRROR_CHROOT="${LB_MIRROR_CHROOT}"
-
-# \$LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
-# (Default: ${LB_MIRROR_CHROOT_SECURITY})
-LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY}"
-
-# \$LB_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: ${LB_MIRROR_BINARY})
-LB_MIRROR_BINARY="${LB_MIRROR_BINARY}"
-
-# \$LB_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
-# (Default: ${LB_MIRROR_BINARY_SECURITY})
-LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY}"
-
-# \$LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
-# (Default: ${LB_MIRROR_BOOTSTRAP})
-LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER}"
-
 # \$LB_BOOTSTRAP_QEMU_ARCHITECTURES: architectures to use foreign bootstrap
 # (Default: ${LB_BOOTSTRAP_QEMU_ARCHITECTURES})
 LB_BOOTSTRAP_QEMU_ARCHITECTURES="${LB_BOOTSTRAP_QEMU_ARCHITECTURES}"