diff --git a/app-misc/beep/beep-1.4.12.ebuild b/app-misc/beep/beep-1.4.12.ebuild
index d835511e0953c..bf2ebed0a0c49 100644
--- a/app-misc/beep/beep-1.4.12.ebuild
+++ b/app-misc/beep/beep-1.4.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/spkr-beep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ~ppc64 sparc x86"
 
 # Tests require a speaker
 RESTRICT="test"
diff --git a/app-misc/fastfetch/fastfetch-2.1.2.ebuild b/app-misc/fastfetch/fastfetch-2.1.2.ebuild
index 326d5cc6f48e9..06c87d14e84d9 100644
--- a/app-misc/fastfetch/fastfetch-2.1.2.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.1.2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
 else
 	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~loong ~riscv"
+	KEYWORDS="~amd64 ~loong ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/mmv/mmv-2.5.1.ebuild b/app-misc/mmv/mmv-2.5.1.ebuild
index 8bae6e9fcfda3..d3701c25be49c 100644
--- a/app-misc/mmv/mmv-2.5.1.ebuild
+++ b/app-misc/mmv/mmv-2.5.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/rrthomas/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="dev-libs/boehm-gc"
 RDEPEND="${DEPEND}"
diff --git a/app-text/pdftk/pdftk-3.3.3-r2.ebuild b/app-text/pdftk/pdftk-3.3.3-r2.ebuild
index 8c69e453f9113..fce7d12252341 100644
--- a/app-text/pdftk/pdftk-3.3.3-r2.ebuild
+++ b/app-text/pdftk/pdftk-3.3.3-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # Switch back to bcprov:0 once pdftk updates its bcprov dependency.
 CP_DEPEND="
diff --git a/dev-java/bcmail/bcmail-1.76.ebuild b/dev-java/bcmail/bcmail-1.76.ebuild
index 6dc5f549a7867..7481cfafac796 100644
--- a/dev-java/bcmail/bcmail-1.76.ebuild
+++ b/dev-java/bcmail/bcmail-1.76.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 CP_DEPEND="
 	~dev-java/bcpkix-${PV}:0
diff --git a/dev-java/bcpg/bcpg-1.76.ebuild b/dev-java/bcpg/bcpg-1.76.ebuild
index 5fe2ed0e3ad2d..1ff0b814ff140 100644
--- a/dev-java/bcpg/bcpg-1.76.ebuild
+++ b/dev-java/bcpg/bcpg-1.76.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 CP_DEPEND="~dev-java/bcprov-${PV}:0"
 DEPEND="${CP_DEPEND}
diff --git a/dev-java/bcpkix/bcpkix-1.76.ebuild b/dev-java/bcpkix/bcpkix-1.76.ebuild
index a76fc41d53560..9aa6245b852f7 100644
--- a/dev-java/bcpkix/bcpkix-1.76.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.76.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 # 1) testSANMismatchIP(org.bouncycastle.est.test.TestHostNameAuthorizer)
 # org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0
diff --git a/dev-java/bcprov/bcprov-1.74.ebuild b/dev-java/bcprov/bcprov-1.74.ebuild
index 819d85eb7fb25..6918c239c1920 100644
--- a/dev-java/bcprov/bcprov-1.74.ebuild
+++ b/dev-java/bcprov/bcprov-1.74.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="1.74"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/bcprov/bcprov-1.76.ebuild b/dev-java/bcprov/bcprov-1.76.ebuild
index 7082ceaf960a2..f9f0138ab384f 100644
--- a/dev-java/bcprov/bcprov-1.76.ebuild
+++ b/dev-java/bcprov/bcprov-1.76.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/bcutil/bcutil-1.76.ebuild b/dev-java/bcutil/bcutil-1.76.ebuild
index bd2e8c5bd0fe8..704b1848606c2 100644
--- a/dev-java/bcutil/bcutil-1.76.ebuild
+++ b/dev-java/bcutil/bcutil-1.76.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 CDEPEND="~dev-java/bcprov-${PV}:0"
 DEPEND="${CDEPEND}
diff --git a/dev-libs/yyjson/yyjson-0.8.0.ebuild b/dev-libs/yyjson/yyjson-0.8.0.ebuild
index 5b565deab8f62..93aacd17c8be1 100644
--- a/dev-libs/yyjson/yyjson-0.8.0.ebuild
+++ b/dev-libs/yyjson/yyjson-0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibireme/yyjson/archive/refs/tags/${PV}.tar.gz -> ${P
 
 LICENSE="MIT test? ( BSD )"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~loong ~riscv"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 
 IUSE="doc test"
 
diff --git a/dev-python/nh3/nh3-0.2.14.ebuild b/dev-python/nh3/nh3-0.2.14.ebuild
index 2eae307048a84..b60032d3f9032 100644
--- a/dev-python/nh3/nh3-0.2.14.ebuild
+++ b/dev-python/nh3/nh3-0.2.14.ebuild
@@ -92,7 +92,7 @@ LICENSE+="
 	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/readme-renderer/readme-renderer-42.0.ebuild b/dev-python/readme-renderer/readme-renderer-42.0.ebuild
index a465f528f9d09..17f196583b185 100644
--- a/dev-python/readme-renderer/readme-renderer-42.0.ebuild
+++ b/dev-python/readme-renderer/readme-renderer-42.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]