diff --git a/pipeline/build/valid_os.go b/pipeline/build/valid_os.go
index 1f5e9e0dc..9dcf7534d 100644
--- a/pipeline/build/valid_os.go
+++ b/pipeline/build/valid_os.go
@@ -15,8 +15,8 @@ var valids = []string{
 	"linuxamd64",
 	"linuxarm",
 	"linuxarm64",
-	"linuxppc64",
-	"linuxppc64le",
+	// "linuxppc64", - https://github.com/golang/go/issues/10087
+	// "linuxppc64le", - https://github.com/golang/go/issues/10087
 	"linuxmips",
 	"linuxmipsle",
 	"linuxmips64",
@@ -26,7 +26,7 @@ var valids = []string{
 	"netbsdarm",
 	"openbsd386",
 	"openbsdamd64",
-	"openbsdarm",
+	// "openbsdarm", - https://github.com/golang/go/issues/10087
 	"plan9386",
 	"plan9amd64",
 	"solarisamd64",
diff --git a/pipeline/build/valid_os_test.go b/pipeline/build/valid_os_test.go
index c2f35ef00..1c3e10298 100644
--- a/pipeline/build/valid_os_test.go
+++ b/pipeline/build/valid_os_test.go
@@ -22,8 +22,6 @@ func TestValid(t *testing.T) {
 		{"linux", "amd64"},
 		{"linux", "arm"},
 		{"linux", "arm64"},
-		{"linux", "ppc64"},
-		{"linux", "ppc64le"},
 		{"linux", "mips"},
 		{"linux", "mipsle"},
 		{"linux", "mips64"},
@@ -33,7 +31,6 @@ func TestValid(t *testing.T) {
 		{"netbsd", "arm"},
 		{"openbsd", "386"},
 		{"openbsd", "amd64"},
-		{"openbsd", "arm"},
 		{"plan9", "386"},
 		{"plan9", "amd64"},
 		{"solaris", "amd64"},
@@ -55,6 +52,9 @@ func TestInvalid(t *testing.T) {
 		{"darwin", "arm64"},
 		{"windows", "arm"},
 		{"windows", "arm64"},
+		{"linux", "ppc64"},
+		{"linux", "ppc64le"},
+		{"openbsd", "arm"},
 	}
 	for _, p := range platforms {
 		t.Run(fmt.Sprintf("%v %v is invalid", p.os, p.arch), func(t *testing.T) {