diff --git a/model/event_settings.go b/model/event_settings.go
index 24bf097e..8ac24090 100755
--- a/model/event_settings.go
+++ b/model/event_settings.go
@@ -58,7 +58,7 @@ func (database *Database) GetEventSettings() (*EventSettings, error) {
 		SelectionRound2Order:        "L",
 		SelectionRound3Order:        "",
 		TBADownloadEnabled:          true,
-		ApTeamChannel:               157,
+		ApTeamChannel:               37,
 		ApAdminChannel:              0,
 		ApAdminWpaKey:               "1234Five",
 		Ap2TeamChannel:              0,
diff --git a/model/event_settings_test.go b/model/event_settings_test.go
index f4d393e9..e1fe2b29 100644
--- a/model/event_settings_test.go
+++ b/model/event_settings_test.go
@@ -4,8 +4,9 @@
 package model
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestEventSettingsReadWrite(t *testing.T) {
@@ -24,7 +25,7 @@ func TestEventSettingsReadWrite(t *testing.T) {
 			SelectionRound2Order:        "L",
 			SelectionRound3Order:        "",
 			TBADownloadEnabled:          true,
-			ApTeamChannel:               157,
+			ApTeamChannel:               37,
 			ApAdminChannel:              0,
 			ApAdminWpaKey:               "1234Five",
 			WarmupDurationSec:           0,
diff --git a/templates/setup_settings.html b/templates/setup_settings.html
index 11c31fba..8f4d0a2a 100755
--- a/templates/setup_settings.html
+++ b/templates/setup_settings.html
@@ -172,17 +172,15 @@
             </div>
           </div>
           <div class="form-group">
-            <label class="col-lg-5 control-label">AP Team Channel (5GHz)</label>
+            <label class="col-lg-5 control-label">AP Team Channel (6GHz)</label>
             <div class="col-lg-7">
               <select class="form-control" name="apTeamChannel" value="{{.ApTeamChannel}}">
-                <option{{if eq .ApTeamChannel 36}} selected{{end}}>36</option>
-                <option{{if eq .ApTeamChannel 40}} selected{{end}}>40</option>
-                <option{{if eq .ApTeamChannel 44}} selected{{end}}>44</option>
-                <option{{if eq .ApTeamChannel 48}} selected{{end}}>48</option>
-                <option{{if eq .ApTeamChannel 149}} selected{{end}}>149</option>
-                <option{{if eq .ApTeamChannel 153}} selected{{end}}>153</option>
-                <option{{if eq .ApTeamChannel 157}} selected{{end}}>157</option>
-                <option{{if eq .ApTeamChannel 161}} selected{{end}}>161</option>
+                {{range $i, $j := seq 29}}
+                <option value="{{(add 5 (multiply $i 8))}}"
+                    {{if eq $.ApTeamChannel (add 5 (multiply $i 8))}} selected{{end}}>
+                    {{(add 5 (multiply $i 8))}}
+                </option>
+                {{end}}
               </select>
             </div>
           </div>
@@ -236,18 +234,16 @@
             </div>
           </div>
           <div class="form-group">
-            <label class="col-lg-5 control-label">Second AP Team Channel (5GHz)</label>
+            <label class="col-lg-5 control-label">Second AP Team Channel (6GHz)</label>
             <div class="col-lg-7">
               <select class="form-control" name="ap2TeamChannel" value="{{.Ap2TeamChannel}}">
                 <option{{if eq .Ap2TeamChannel 0}} selected{{end}}>Disabled</option>
-                <option{{if eq .Ap2TeamChannel 36}} selected{{end}}>36</option>
-                <option{{if eq .Ap2TeamChannel 40}} selected{{end}}>40</option>
-                <option{{if eq .Ap2TeamChannel 44}} selected{{end}}>44</option>
-                <option{{if eq .Ap2TeamChannel 48}} selected{{end}}>48</option>
-                <option{{if eq .Ap2TeamChannel 149}} selected{{end}}>149</option>
-                <option{{if eq .Ap2TeamChannel 153}} selected{{end}}>153</option>
-                <option{{if eq .Ap2TeamChannel 157}} selected{{end}}>157</option>
-                <option{{if eq .Ap2TeamChannel 161}} selected{{end}}>161</option>
+                {{range $i, $j := seq 29}}
+                <option value="{{(add 5 (multiply $i 8))}}"
+                    {{if eq $.Ap2TeamChannel (add 5 (multiply $i 8))}} selected{{end}}>
+                    {{(add 5 (multiply $i 8))}}
+                </option>
+                {{end}}
               </select>
             </div>
           </div>