diff --git a/debootstrap-ng.sh b/debootstrap-ng.sh
index 2222c85625..4fc816fc16 100644
--- a/debootstrap-ng.sh
+++ b/debootstrap-ng.sh
@@ -477,13 +477,13 @@ create_image()
 	# unmount /boot first, rootfs second, image file last
 	sync
 	[[ $BOOTSIZE != 0 ]] && umount -l $CACHEDIR/$MOUNT/boot
-	[[ $ROOTFS_TYPE != nfs ]] && umount -l $CACHEDIR/$MOUNT	
+	[[ $ROOTFS_TYPE != nfs ]] && umount -l $CACHEDIR/$MOUNT
 	losetup -d $LOOP
 	rm -rf --one-file-system $CACHEDIR/$DESTIMG $CACHEDIR/$MOUNT
 	mkdir -p $CACHEDIR/$DESTIMG
 	cp $CACHEDIR/$SDCARD/etc/armbian.txt $CACHEDIR/$DESTIMG
 	mv $CACHEDIR/${SDCARD}.raw $CACHEDIR/$DESTIMG/${version}.img
-	[[ $BUILD_ALL != yes ]] && cp $CACHEDIR/$DESTIMG/${version}.img $DEST/images/${version}.img	
+	[[ $BUILD_ALL != yes ]] && cp $CACHEDIR/$DESTIMG/${version}.img $DEST/images/${version}.img
 	display_alert "Done building" "$DEST/images/${version}.img" "info"
 
 } #############################################################################
diff --git a/distributions.sh b/distributions.sh
index 7ebf99bc2f..8865f62fca 100644
--- a/distributions.sh
+++ b/distributions.sh
@@ -159,6 +159,9 @@ install_common()
 
 	# copy "first run automated config, optional user configured"
  	cp $SRC/lib/config/armbian_first_run.txt $CACHEDIR/$SDCARD/boot/armbian_first_run.txt
+
+	# switch to beta repository at this stage if building nightly images
+	[[ $IMAGE_TYPE == nightly ]] && echo "deb http://beta.armbian.com $RELEASE main utils ${RELEASE}-desktop" > $CACHEDIR/$SDCARD/etc/apt/sources.list.d/armbian.list
 }
 
 install_distribution_specific()
diff --git a/general.sh b/general.sh
index eacf224833..f092ff4e47 100644
--- a/general.sh
+++ b/general.sh
@@ -134,12 +134,6 @@ create_sources_list()
 	deb http://security.debian.org/ ${release}/updates main contrib non-free
 	#deb-src http://security.debian.org/ ${release}/updates main contrib non-free
 	EOF
-
-	cat <<-EOF > $basedir/etc/apt/preferences.d/90-backports.pref
-	#Package: *
-	#Pin: release n=${release}-backports
-	#Pin-Priority: 100
-	EOF
 	;;
 
 	trusty|xenial)
@@ -156,12 +150,6 @@ create_sources_list()
 	deb http://${UBUNTU_MIRROR} ${release}-backports main restricted universe multiverse
 	#deb-src http://${UBUNTU_MIRROR} ${release}-backports main restricted universe multiverse
 	EOF
-
-	cat <<-EOF > $basedir/etc/apt/preferences.d/90-backports.pref
-	#Package: *
-	#Pin: release a=${release}-backports
-	#Pin-Priority: 100
-	EOF
 	;;
 	esac
 }