diff --git a/config/defaults.json b/config/defaults.json
index 56f1532c..10fcd97a 100644
--- a/config/defaults.json
+++ b/config/defaults.json
@@ -14,7 +14,7 @@
           "# N",
           "ieee80211n=1",
           "require_ht=1",
-          "ht_capab=[MAX-AMSDU-3839][HT40+][SHORT-GI-20][SHORT-GI-40][DSSS_CCK-40]",
+          "ht_capab=[MAX-AMSDU-3839][{HT40_DIR}][SHORT-GI-20][SHORT-GI-40][DSSS_CCK-40]",
           "# AC",
           "ieee80211ac=1",
           "require_vht=1",
@@ -35,17 +35,23 @@
           "ieee80211ac=1",
           "# Enable 802.11ax",
           "ieee80211ax=1",
-          "# High efficiency capabilities",
+          "# HE (802.11ax) capabilities",
           "he_su_beamformer=1",
           "he_su_beamformee=1",
           "he_mu_beamformer=1",
           "# BSS color for spatial reuse, value 1-63",
           "he_bss_color=1",
           "he_oper_chwidth=1",
-          "ht_capab=[HT40+][SHORT-GI-20][SHORT-GI-40]",
-          "vht_capab=[SHORT-GI-80]",
-          "he_oper_centr_freq_seg0_idx=155",
-          "vht_oper_centr_freq_seg0_idx=155",
+          "# HE/VHT channel widths",
+          "he_oper_chwidth=1",
+          "vht_oper_chwidth=1",
+          "he_oper_centr_freq_seg0_idx={HE_FREQ_IDX}",
+          "vht_oper_centr_freq_seg0_idx={VHT_FREQ_IDX}",
+          "# HT capabilities (802.11n)",
+          "ht_capab=[{HT40_DIR}][LDPC][SHORT-GI-20][SHORT-GI-40][TX-STBC][RX-STBC1][MAX-AMSDU-7935]",
+          "# VHT capabilities (802.11ac) - no SHORT-GI-160",
+          "vht_capab=[RXLDPC][SHORT-GI-80][TX-STBC-2BY1][RX-STBC-1][MAX-MPDU-11454][MAX-A-MPDU-LEN-EXP7]",
+          "# WMM/QoS",
           "wmm_enabled=1"
         ]
       },