diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst
index 44286a5293..6591fa440a 100644
--- a/docs/user/supported_devices.rst
+++ b/docs/user/supported_devices.rst
@@ -125,10 +125,6 @@ ath79-generic
 
 * Ubiquiti
 
-  - NanoBeam 5AC 19 (XC)
-  - NanoBeam M5 (XW)
-  - NanoStation Loco M2/M5 (XW)
-  - NanoStation M2/M5 (XW)
   - UniFi AC Lite
   - UniFi AC LR
   - UniFi AC Mesh
diff --git a/targets/ath79-generic b/targets/ath79-generic
index 842ff03462..56be6369ba 100644
--- a/targets/ath79-generic
+++ b/targets/ath79-generic
@@ -519,20 +519,20 @@ device('tp-link-wbs510-v1', 'tplink_wbs510-v1', {
 
 -- Ubiquiti
 
-device('ubiquiti-nanostation-loco-m-xw', 'ubnt_nanostation-loco-m-xw', {
-	manifest_aliases = {
-		'ubiquiti-loco-m-xw', -- upgrade from OpenWrt 19.07
-		'ubiquiti-nanostation-loco-m2-xw', -- upgrade from OpenWrt 19.07
-		'ubiquiti-nanostation-loco-m5-xw', -- upgrade from OpenWrt 19.07
-	},
-})
+-- device('ubiquiti-nanostation-loco-m-xw', 'ubnt_nanostation-loco-m-xw', {
+--	manifest_aliases = {
+--		'ubiquiti-loco-m-xw', -- upgrade from OpenWrt 19.07
+--		'ubiquiti-nanostation-loco-m2-xw', -- upgrade from OpenWrt 19.07
+--		'ubiquiti-nanostation-loco-m5-xw', -- upgrade from OpenWrt 19.07
+--	},
+-- })
 
-device('ubiquiti-nanostation-m-xw', 'ubnt_nanostation-m-xw', {
-	manifest_aliases = {
-		'ubiquiti-nanostation-m2-xw', -- upgrade from OpenWrt 19.07
-		'ubiquiti-nanostation-m5-xw', -- upgrade from OpenWrt 19.07
-	},
-})
+-- device('ubiquiti-nanostation-m-xw', 'ubnt_nanostation-m-xw', {
+--	manifest_aliases = {
+--		'ubiquiti-nanostation-m2-xw', -- upgrade from OpenWrt 19.07
+--		'ubiquiti-nanostation-m5-xw', -- upgrade from OpenWrt 19.07
+--	},
+-- })
 
 device('ubiquiti-unifi-ac-lite', 'ubnt_unifiac-lite', {
 	factory = false,
@@ -568,11 +568,11 @@ device('ubiquiti-unifi-ap', 'ubnt_unifi-ap', {
 	},
 })
 
-device('ubiquiti-nanobeam-ac-gen1-xc', 'ubnt_nanobeam-ac-xc', {
-	packages = ATH10K_PACKAGES_QCA9880,
-})
+-- device('ubiquiti-nanobeam-ac-gen1-xc', 'ubnt_nanobeam-ac-xc', {
+--	packages = ATH10K_PACKAGES_QCA9880,
+-- })
 
-device('ubiquiti-nanobeam-m5-xw', 'ubnt_nanobeam-m5-xw')
+-- device('ubiquiti-nanobeam-m5-xw', 'ubnt_nanobeam-m5-xw')
 
 device('ubiquiti-unifi-ap-outdoor+', 'ubnt_unifi-ap-outdoor-plus', {
 	manifest_aliases = {