diff --git a/dev-lang/go/go-1.15.12.ebuild b/dev-lang/go/go-1.15.12.ebuild
index c6f44ded0379f..086899cb8eba3 100644
--- a/dev-lang/go/go-1.15.12.ebuild
+++ b/dev-lang/go/go-1.15.12.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 arm ~arm64 ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* ~amd64 arm ~arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/go/go-1.16.4.ebuild b/dev-lang/go/go-1.16.4.ebuild
index c6f44ded0379f..086899cb8eba3 100644
--- a/dev-lang/go/go-1.16.4.ebuild
+++ b/dev-lang/go/go-1.16.4.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 arm ~arm64 ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* ~amd64 arm ~arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac