diff --git a/model/team_test.go b/model/team_test.go
index 6c05fef23c..c5cbb9ee61 100644
--- a/model/team_test.go
+++ b/model/team_test.go
@@ -100,6 +100,8 @@ var tReservedDomains = []struct {
 	{"admin", true},
 	{"Admin-punch", true},
 	{"spin-punch-admin", false},
+	{"playbooks", true},
+	{"boards", true},
 }
 
 func TestReservedTeamName(t *testing.T) {
diff --git a/model/utils.go b/model/utils.go
index 481d57ce94..2ddc6cabdf 100644
--- a/model/utils.go
+++ b/model/utils.go
@@ -392,6 +392,8 @@ var reservedName = []string{
 	"plugins",
 	"post",
 	"signup",
+	"boards",
+	"playbooks",
 }
 
 func IsValidChannelIdentifier(s string) bool {