diff --git a/config/defaults.json b/config/defaults.json
index 10fcd97a..ff8609a8 100644
--- a/config/defaults.json
+++ b/config/defaults.json
@@ -63,15 +63,14 @@
           "ieee80211n=1",
           "ieee80211ac=1",
           "ieee80211ax=1",
-          "vht_oper_chwidth=2  # 160 MHz for VHT",
-          "vht_oper_centr_freq_seg0_idx=50",
-          "vht_capab=[MAX-MPDU-11454][RXLDPC][SHORT-GI-80][SHORT-GI-160][TX-STBC-2BY1][RX-STBC-1][SU-BEAMFORMER][SU-BEAMFORMEE][MU-BEAMFORMER][MU-BEAMFORMEE]",
+          "# HE capabilities",
           "he_su_beamformer=1",
           "he_su_beamformee=1",
           "he_mu_beamformer=1",
           "he_bss_color=1",
-          "he_oper_chwidth=2  # 160 MHz for HE",
-          "he_oper_centr_freq_seg0_idx=50",
+          "# 160 MHz for HE",
+          "he_oper_chwidth=2",
+          "he_oper_centr_freq_seg0_idx={HE_FREQ_IDX}",
           "# Enable 802.11be",
           "ieee80211be=1",
           "# EHT configuration",
@@ -80,8 +79,13 @@
           "eht_mu_beamformer=1",
           "eht_oper_chwidth=2",
           "# EHT operation parameters",
-          "eht_oper_chwidth=2  # 160 MHz, 0=20, 1=40, 2=80, 3=160, 4=320",
+          "# 160 MHz, 0=20, 1=40, 2=80, 3=160, 4=320",
+          "eht_oper_chwidth=2",
           "eht_oper_centr_freq_seg0_idx={VHT_FREQ_IDX}",
+          "# VHT operation parameters",
+          "vht_oper_chwidth=2",
+          "vht_oper_centr_freq_seg0_idx={VHT_FREQ_IDX}",
+          "vht_capab=[MAX-MPDU-11454][RXLDPC][SHORT-GI-80][SHORT-GI-160][TX-STBC-2BY1][RX-STBC-1][SU-BEAMFORMER][SU-BEAMFORMEE][MU-BEAMFORMER][MU-BEAMFORMEE]",
           "# WMM configuration",
           "wmm_enabled=1",
           "wmm_ac_bk_cwmin=4",