diff --git a/config/boards/armsom-sige1.csc b/config/boards/armsom-sige1.csc
index a663cedd5..5de474efa 100644
--- a/config/boards/armsom-sige1.csc
+++ b/config/boards/armsom-sige1.csc
@@ -8,5 +8,4 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-armsom-sige1.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
diff --git a/config/boards/hinlink-h28k.csc b/config/boards/hinlink-h28k.csc
index 665c44257..24557d42c 100644
--- a/config/boards/hinlink-h28k.csc
+++ b/config/boards/hinlink-h28k.csc
@@ -8,7 +8,6 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-hinlink-h28k.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
diff --git a/config/boards/hinlink-h66k.csc b/config/boards/hinlink-h66k.csc
index 48e0a11a4..94ebf1b65 100644
--- a/config/boards/hinlink-h66k.csc
+++ b/config/boards/hinlink-h66k.csc
@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-h66k.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="fat"
diff --git a/config/boards/hinlink-h68k.csc b/config/boards/hinlink-h68k.csc
index eeb374c9b..8c874cc22 100644
--- a/config/boards/hinlink-h68k.csc
+++ b/config/boards/hinlink-h68k.csc
@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-h68k.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="fat"
diff --git a/config/boards/hinlink-hnas.csc b/config/boards/hinlink-hnas.csc
index 1d32a6131..5daae3e39 100644
--- a/config/boards/hinlink-hnas.csc
+++ b/config/boards/hinlink-hnas.csc
@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-hnas.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="fat"
diff --git a/config/boards/hinlink-ht2.csc b/config/boards/hinlink-ht2.csc
index 4d1fada10..fa9cd94ee 100644
--- a/config/boards/hinlink-ht2.csc
+++ b/config/boards/hinlink-ht2.csc
@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-hinlink-ht2.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="ext4"
diff --git a/config/boards/mangopi-m28k.csc b/config/boards/mangopi-m28k.csc
index 429a1e0f8..8821cf03d 100644
--- a/config/boards/mangopi-m28k.csc
+++ b/config/boards/mangopi-m28k.csc
@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-mangopi-m28k.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="ext4"
diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh
index 2833ce4f8..eeeef1cc7 100644
--- a/lib/functions/configuration/main-config.sh
+++ b/lib/functions/configuration/main-config.sh
@@ -267,7 +267,6 @@ function do_main_configuration() {
 	[[ -z $OFFSET ]] && OFFSET=4 # offset to 1st partition (we use 4MiB boundaries by default)
 	[[ -z $ARCH ]] && ARCH=arm64 # makes little sense to default to anything... # @TODO: remove, but check_config_userspace_release_and_desktop requires it
 	ATF_COMPILE=yes              # @TODO: move to armhf/arm64
-	[[ -z $WIREGUARD ]] && WIREGUARD="yes"
 	[[ -z $EXTRAWIFI ]] && EXTRAWIFI="yes"
 	[[ -z $PLYMOUTH ]] && PLYMOUTH="yes"
 	[[ -z $AUFS ]] && AUFS="yes"
diff --git a/lib/functions/rootfs/distro-agnostic.sh b/lib/functions/rootfs/distro-agnostic.sh
index 273b27182..782c5b155 100644
--- a/lib/functions/rootfs/distro-agnostic.sh
+++ b/lib/functions/rootfs/distro-agnostic.sh
@@ -352,11 +352,6 @@ function install_distribution_agnostic() {
 		chroot_sdcard_apt_get_remove --auto-remove plymouth
 	fi
 
-	# install wireguard tools
-	if [[ $WIREGUARD == yes ]]; then
-		install_deb_chroot "wireguard-tools" "remote" # @TODO: move this to some image pkg list in config
-	fi
-
 	# freeze armbian packages
 	if [[ "${BSPFREEZE:-"no"}" == yes ]]; then
 		display_alert "Freezing Armbian packages" "$BOARD" "info"