diff --git a/internal/builders/golang/targets.go b/internal/builders/golang/targets.go
index 74fdc89d59b..5af541c1930 100644
--- a/internal/builders/golang/targets.go
+++ b/internal/builders/golang/targets.go
@@ -123,6 +123,7 @@ var validTargets = []string{
 	"freebsd386",
 	"freebsdamd64",
 	"freebsdarm",
+	"freebsdarm64", // not on the official list for some reason, yet its supported on go 1.14+
 	"illumosamd64",
 	"jswasm",
 	"linux386",
@@ -142,6 +143,7 @@ var validTargets = []string{
 	"openbsd386",
 	"openbsdamd64",
 	"openbsdarm",
+	"openbsdarm64",
 	"plan9386",
 	"plan9amd64",
 	"plan9arm",
diff --git a/internal/builders/golang/targets_test.go b/internal/builders/golang/targets_test.go
index c39f9393307..f4b37f73a28 100644
--- a/internal/builders/golang/targets_test.go
+++ b/internal/builders/golang/targets_test.go
@@ -72,8 +72,10 @@ func TestAllBuildTargets(t *testing.T) {
 		"freebsd_amd64",
 		"freebsd_arm_6",
 		"freebsd_arm_7",
+		"freebsd_arm64",
 		"openbsd_386",
 		"openbsd_amd64",
+		"openbsd_arm64",
 		"js_wasm",
 	}, matrix(build))
 }