diff --git a/config/cli/bullseye/main/config_cli_standard/packages.additional b/config/cli/bullseye/main/config_cli_standard/packages.additional
index 5d1e849d4..67dbcc76f 100644
--- a/config/cli/bullseye/main/config_cli_standard/packages.additional
+++ b/config/cli/bullseye/main/config_cli_standard/packages.additional
@@ -11,7 +11,6 @@ f3
 git
 haveged
 hdparm
-hostapd
 i2c-tools
 ifenslave
 iotop
diff --git a/config/cli/bullseye/main/config_desktop/packages.additional b/config/cli/bullseye/main/config_desktop/packages.additional
index 18a07da0b..c38152120 100644
--- a/config/cli/bullseye/main/config_desktop/packages.additional
+++ b/config/cli/bullseye/main/config_desktop/packages.additional
@@ -11,7 +11,6 @@ f3
 git
 haveged
 hdparm
-hostapd
 ifenslave
 iotop
 iperf3
diff --git a/config/cli/buster/main/config_cli_standard/packages.additional b/config/cli/buster/main/config_cli_standard/packages.additional
index 5d1e849d4..67dbcc76f 100644
--- a/config/cli/buster/main/config_cli_standard/packages.additional
+++ b/config/cli/buster/main/config_cli_standard/packages.additional
@@ -11,7 +11,6 @@ f3
 git
 haveged
 hdparm
-hostapd
 i2c-tools
 ifenslave
 iotop
diff --git a/config/cli/buster/main/config_desktop/packages.additional b/config/cli/buster/main/config_desktop/packages.additional
index 18a07da0b..c38152120 100644
--- a/config/cli/buster/main/config_desktop/packages.additional
+++ b/config/cli/buster/main/config_desktop/packages.additional
@@ -11,7 +11,6 @@ f3
 git
 haveged
 hdparm
-hostapd
 ifenslave
 iotop
 iperf3
diff --git a/config/cli/focal/main/config_cli_standard/packages.additional b/config/cli/focal/main/config_cli_standard/packages.additional
index a794d3343..1858e5fa7 100644
--- a/config/cli/focal/main/config_cli_standard/packages.additional
+++ b/config/cli/focal/main/config_cli_standard/packages.additional
@@ -11,7 +11,6 @@ f3
 git
 haveged
 hdparm
-hostapd
 ifenslave
 iotop
 iperf3
diff --git a/config/cli/focal/main/config_desktop/packages.additional b/config/cli/focal/main/config_desktop/packages.additional
index 18a07da0b..c38152120 100644
--- a/config/cli/focal/main/config_desktop/packages.additional
+++ b/config/cli/focal/main/config_desktop/packages.additional
@@ -11,7 +11,6 @@ f3
 git
 haveged
 hdparm
-hostapd
 ifenslave
 iotop
 iperf3
diff --git a/config/cli/sid/main/config_cli_standard/packages.additional b/config/cli/sid/main/config_cli_standard/packages.additional
index fc71cb1a3..dbb2e933a 100644
--- a/config/cli/sid/main/config_cli_standard/packages.additional
+++ b/config/cli/sid/main/config_cli_standard/packages.additional
@@ -10,7 +10,6 @@ f3
 git
 haveged
 hdparm
-hostapd
 i2c-tools
 ifenslave
 iotop
diff --git a/config/cli/sid/main/config_desktop/packages.additional b/config/cli/sid/main/config_desktop/packages.additional
index 20555f589..14551cdb7 100644
--- a/config/cli/sid/main/config_desktop/packages.additional
+++ b/config/cli/sid/main/config_desktop/packages.additional
@@ -10,7 +10,6 @@ f3
 git
 haveged
 hdparm
-hostapd
 ifenslave
 iotop
 iperf3
diff --git a/config/sources/families/jethub.conf b/config/sources/families/jethub.conf
index 8cc6bc08f..b84cbec2a 100644
--- a/config/sources/families/jethub.conf
+++ b/config/sources/families/jethub.conf
@@ -161,9 +161,6 @@ family_tweaks() {
 	# pip3 packages
 	chroot "${SDCARD}" /bin/bash -c "pip3 install pyserial intelhex python-magic" >> "${DEST}"/debug/install.log 2>&1
 
-	# Hostapd
-	chroot "${SDCARD}" /bin/bash -c "systemctl --no-reload disable hostapd.service >/dev/null 2>&1"
-
 	if [[ "$BOARD" == jethubj80 ]]; then
 		# Bluetooth
 		chroot "${SDCARD}" /bin/bash -c "systemctl --no-reload enable jethub-rtk-hciattach.service >/dev/null 2>&1"