diff --git a/dashboard/builders.go b/dashboard/builders.go
index d99c814..4163f04 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -28,72 +28,74 @@
 	"ios-amd64":     "", // There is no builder for the iOS Simulator. See issues 42100 and 42177.
 	"windows-arm64": "", // TODO(golang.org/issue/42604): Add builder for windows/arm64.
 
-	"386":            "linux-386",
-	"aix":            "aix-ppc64",
-	"amd64":          "linux-amd64",
-	"android":        "android-amd64-emu",
-	"android-386":    "android-386-emu",
-	"android-amd64":  "android-amd64-emu",
-	"android-arm":    "android-arm-corellium",
-	"android-arm64":  "android-arm64-corellium",
-	"arm":            "linux-arm",
-	"arm64":          "linux-arm64-packet",
-	"darwin":         "darwin-amd64-10_14",
-	"darwin-amd64":   "darwin-amd64-10_14",
-	"darwin-arm64":   "darwin-arm64-11_0-toothrot",
-	"ios-arm64":      "ios-arm64-corellium",
-	"dragonfly":      "dragonfly-amd64",
-	"freebsd":        "freebsd-amd64-12_0",
-	"freebsd-386":    "freebsd-386-12_0",
-	"freebsd-amd64":  "freebsd-amd64-12_0",
-	"freebsd-arm":    "freebsd-arm-paulzhol",
-	"freebsd-arm64":  "freebsd-arm64-dmgk",
-	"illumos":        "illumos-amd64",
-	"ios":            "ios-arm64-corellium",
-	"js":             "js-wasm",
-	"linux":          "linux-amd64",
-	"linux-arm64":    "linux-arm64-packet",
-	"linux-mips":     "linux-mips-rtrk",
-	"linux-mips64":   "linux-mips64-rtrk",
-	"linux-mips64le": "linux-mips64le-mengzhuo",
-	"linux-mipsle":   "linux-mipsle-rtrk",
-	"linux-ppc64":    "linux-ppc64-buildlet",
-	"linux-ppc64le":  "linux-ppc64le-buildlet",
-	"linux-riscv64":  "linux-riscv64-jsing",
-	"linux-s390x":    "linux-s390x-ibm",
-	"longtest":       "linux-amd64-longtest",
-	"mac":            "darwin-amd64-10_14",
-	"macos":          "darwin-amd64-10_14",
-	"mips":           "linux-mips-rtrk",
-	"mips64":         "linux-mips64-rtrk",
-	"mips64le":       "linux-mips64le-mengzhuo",
-	"mipsle":         "linux-mipsle-rtrk",
-	"netbsd":         "netbsd-amd64-9_0",
-	"netbsd-386":     "netbsd-386-9_0",
-	"netbsd-amd64":   "netbsd-amd64-9_0",
-	"netbsd-arm":     "netbsd-arm-bsiegert",
-	"netbsd-arm64":   "netbsd-arm64-bsiegert",
-	"nocgo":          "linux-amd64-nocgo",
-	"openbsd":        "openbsd-amd64-68",
-	"openbsd-386":    "openbsd-386-68",
-	"openbsd-amd64":  "openbsd-amd64-68",
-	"openbsd-arm":    "openbsd-arm-jsing",
-	"openbsd-arm64":  "openbsd-arm64-jsing",
-	"openbsd-mips64": "openbsd-mips64-jsing",
-	"plan9":          "plan9-arm",
-	"plan9-386":      "plan9-386-0intro",
-	"plan9-amd64":    "plan9-amd64-9front",
-	"ppc64":          "linux-ppc64-buildlet",
-	"ppc64le":        "linux-ppc64le-buildlet",
-	"riscv64":        "linux-riscv64-jsing",
-	"s390x":          "linux-s390x-ibm",
-	"solaris":        "solaris-amd64-oraclerel",
-	"solaris-amd64":  "solaris-amd64-oraclerel",
-	"wasm":           "js-wasm",
-	"windows":        "windows-amd64-2016",
-	"windows-386":    "windows-386-2008",
-	"windows-amd64":  "windows-amd64-2016",
-	"windows-arm":    "windows-arm-zx2c4",
+	"386":                  "linux-386",
+	"aix":                  "aix-ppc64",
+	"amd64":                "linux-amd64",
+	"android":              "android-amd64-emu",
+	"android-386":          "android-386-emu",
+	"android-amd64":        "android-amd64-emu",
+	"android-arm":          "android-arm-corellium",
+	"android-arm64":        "android-arm64-corellium",
+	"arm":                  "linux-arm",
+	"arm64":                "linux-arm64-packet",
+	"darwin":               "darwin-amd64-10_14",
+	"darwin-amd64":         "darwin-amd64-10_14",
+	"darwin-arm64":         "darwin-arm64-11_0-toothrot",
+	"ios-arm64":            "ios-arm64-corellium",
+	"dragonfly":            "dragonfly-amd64",
+	"freebsd":              "freebsd-amd64-12_0",
+	"freebsd-386":          "freebsd-386-12_0",
+	"freebsd-amd64":        "freebsd-amd64-12_0",
+	"freebsd-arm":          "freebsd-arm-paulzhol",
+	"freebsd-arm64":        "freebsd-arm64-dmgk",
+	"illumos":              "illumos-amd64",
+	"ios":                  "ios-arm64-corellium",
+	"js":                   "js-wasm",
+	"linux":                "linux-amd64",
+	"linux-arm64":          "linux-arm64-packet",
+	"linux-mips":           "linux-mips-rtrk",
+	"linux-mips64":         "linux-mips64-rtrk",
+	"linux-mips64le":       "linux-mips64le-mengzhuo",
+	"linux-mipsle":         "linux-mipsle-rtrk",
+	"linux-ppc64":          "linux-ppc64-buildlet",
+	"linux-ppc64le":        "linux-ppc64le-buildlet",
+	"linux-ppc64le-power9": "linux-ppc64le-power9osu",
+	"linux-riscv64":        "linux-riscv64-jsing",
+	"linux-s390x":          "linux-s390x-ibm",
+	"longtest":             "linux-amd64-longtest",
+	"mac":                  "darwin-amd64-10_14",
+	"macos":                "darwin-amd64-10_14",
+	"mips":                 "linux-mips-rtrk",
+	"mips64":               "linux-mips64-rtrk",
+	"mips64le":             "linux-mips64le-mengzhuo",
+	"mipsle":               "linux-mipsle-rtrk",
+	"netbsd":               "netbsd-amd64-9_0",
+	"netbsd-386":           "netbsd-386-9_0",
+	"netbsd-amd64":         "netbsd-amd64-9_0",
+	"netbsd-arm":           "netbsd-arm-bsiegert",
+	"netbsd-arm64":         "netbsd-arm64-bsiegert",
+	"nocgo":                "linux-amd64-nocgo",
+	"openbsd":              "openbsd-amd64-68",
+	"openbsd-386":          "openbsd-386-68",
+	"openbsd-amd64":        "openbsd-amd64-68",
+	"openbsd-arm":          "openbsd-arm-jsing",
+	"openbsd-arm64":        "openbsd-arm64-jsing",
+	"openbsd-mips64":       "openbsd-mips64-jsing",
+	"plan9":                "plan9-arm",
+	"plan9-386":            "plan9-386-0intro",
+	"plan9-amd64":          "plan9-amd64-9front",
+	"ppc64":                "linux-ppc64-buildlet",
+	"ppc64le":              "linux-ppc64le-buildlet",
+	"ppc64lep9":            "linux-ppc64le-power9osu",
+	"riscv64":              "linux-riscv64-jsing",
+	"s390x":                "linux-s390x-ibm",
+	"solaris":              "solaris-amd64-oraclerel",
+	"solaris-amd64":        "solaris-amd64-oraclerel",
+	"wasm":                 "js-wasm",
+	"windows":              "windows-amd64-2016",
+	"windows-386":          "windows-386-2008",
+	"windows-amd64":        "windows-amd64-2016",
+	"windows-arm":          "windows-arm-zx2c4",
 }
 
 // Builders are the different build configurations.