diff --git a/lib/chroot-buildpackages.sh b/lib/chroot-buildpackages.sh
index dca7ccdfaa..78e436b4f6 100644
--- a/lib/chroot-buildpackages.sh
+++ b/lib/chroot-buildpackages.sh
@@ -38,6 +38,8 @@ create_chroot()
 	components['disco']='main,universe,multiverse'
 	display_alert "Creating build chroot" "$release/$arch" "info"
 	local includes="ccache,locales,git,ca-certificates,devscripts,libfile-fcntllock-perl,debhelper,rsync,python3,distcc"
+	# perhaps a temporally workaround
+	[[ $release == buster ]] && includes=$uncludes",perl-openssl-defaults,libnet-ssleay-perl"
 	if [[ $NO_APT_CACHER != yes ]]; then
 		local mirror_addr="http://localhost:3142/${apt_mirror[$release]}"
 	else
diff --git a/lib/makeboarddeb.sh b/lib/makeboarddeb.sh
index 4744e55af9..7aa779b8cd 100644
--- a/lib/makeboarddeb.sh
+++ b/lib/makeboarddeb.sh
@@ -346,7 +346,7 @@ create_board_package()
                 cp $SRC/packages/bsp/10-override-random-mac.conf $destination/usr/lib/NetworkManager/conf.d/
         ;;
 
-	bionic)
+	disco)
 		mkdir -p $destination/usr/lib/NetworkManager/conf.d/
 		cp $SRC/packages/bsp/zz-override-wifi-powersave-off.conf $destination/usr/lib/NetworkManager/conf.d/
 		cp $SRC/packages/bsp/10-override-random-mac.conf $destination/usr/lib/NetworkManager/conf.d/