diff --git a/lib/functions/main/config-prepare.sh b/lib/functions/main/config-prepare.sh
index 45ada3fee3..299109f466 100644
--- a/lib/functions/main/config-prepare.sh
+++ b/lib/functions/main/config-prepare.sh
@@ -199,14 +199,7 @@ function config_post_main() {
 		ATFSOURCEDIR="${ATFDIR}/$(branch2dir "${ATFBRANCH}")"
 	fi
 
-	declare -g BSP_DESKTOP_PACKAGE_NAME="armbian-bsp-desktop-${BOARD}${EXTRA_BSP_NAME}"
-	declare -g BSP_DESKTOP_PACKAGE_FULLNAME="${BSP_DESKTOP_PACKAGE_NAME}_${REVISION}_${ARCH}"
-
 	declare -g CHOSEN_UBOOT=linux-u-boot-${BRANCH}-${BOARD}
-	declare -g CHOSEN_KERNEL=linux-image-${BRANCH}-${LINUXFAMILY}
-	declare -g CHOSEN_ROOTFS=${BSP_CLI_PACKAGE_NAME}
-	declare -g CHOSEN_DESKTOP=armbian-${RELEASE}-desktop-${DESKTOP_ENVIRONMENT}
-	declare -g CHOSEN_KERNEL_WITH_ARCH=${CHOSEN_KERNEL}-${ARCH} # Only for reporting purposes.
 
 	# So for kernel full cached rebuilds.
 	# We wanna be able to rebuild kernels very fast. so it only makes sense to use a dir for each built kernel.
@@ -218,7 +211,6 @@ function config_post_main() {
 	# If we don't know, we could use BRANCH as reference, but that changes over time, and leads to wastage.
 	if [[ "${skip_kernel:-"no"}" != "yes" ]]; then
 		if [[ -n "${KERNELSOURCE}" ]]; then
-			declare -g ARMBIAN_WILL_BUILD_KERNEL="${CHOSEN_KERNEL}-${ARCH}"
 			if [[ "x${KERNEL_MAJOR_MINOR}x" == "xx" ]]; then
 				exit_with_error "BAD config, missing" "KERNEL_MAJOR_MINOR" "err"
 			fi
@@ -251,7 +243,6 @@ function config_post_main() {
 			fi
 		else
 			declare -g KERNEL_HAS_WORKING_HEADERS="yes" # I assume non-Armbian kernels have working headers, eg: Debian/Ubuntu generic do.
-			declare -g ARMBIAN_WILL_BUILD_KERNEL=no
 		fi
 	else
 		display_alert "Skipping kernel config" "skip_kernel=yes" "debug"
diff --git a/lib/functions/rootfs/distro-agnostic.sh b/lib/functions/rootfs/distro-agnostic.sh
index 78793d0337..3e2832b382 100644
--- a/lib/functions/rootfs/distro-agnostic.sh
+++ b/lib/functions/rootfs/distro-agnostic.sh
@@ -396,13 +396,6 @@ function install_distribution_agnostic() {
 		install_deb_chroot "wireguard-tools" "remote"
 	fi
 
-	# freeze armbian packages
-	if [[ $BSPFREEZE == yes ]]; then
-		display_alert "Freezing Armbian packages" "$BOARD" "info"
-		# @TODO: rpardini: this will probably fail if one or more packages are not installed
-		chroot_sdcard apt-mark hold "${CHOSEN_KERNEL}" "${CHOSEN_KERNEL/image/headers}" "linux-u-boot-${BOARD}-${BRANCH}" "${CHOSEN_KERNEL/image/dtb}"
-	fi
-
 	# remove deb files
 	run_host_command_logged rm -fv "${SDCARD}"/root/*.deb