diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 3833aa4debaba..144a5e516b1bb 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Ionen Wolkens <ionen@gentoo.org> (2021-07-01)
+# gui-libs/egl-wayland with nvidia-drivers is supported on this arch.
+x11-base/xwayland -video_cards_nvidia
+x11-wm/mutter -video_cards_nvidia
+
 # Mike Gilbert <floppym@gentoo.org> (2021-03-29)
 # Unmask TPM on supported archs.
 sys-apps/systemd -tpm
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 5f3f70e98215e..522059cbd0bbf 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org> (2021-07-01)
+# gui-libs/egl-wayland with nvidia-drivers is only usable on some arches.
+x11-base/xwayland video_cards_nvidia
+x11-wm/mutter video_cards_nvidia
+
 # Bernd Waibel <waebbl-gentoo@posteo.net> (2021-06-16)
 # sci-libs/pcl-1.11.1 is missing support for >=sci-libs/vtk-9
 # bug #796368
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 9532c7c62a57f..048fbc3963a11 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org> (2021-07-01)
+# gui-libs/egl-wayland with nvidia-drivers does not function well with
+# the last drivers to support x86 (needed here to override use.mask).
+x11-base/xwayland video_cards_nvidia
+x11-wm/mutter video_cards_nvidia
+
 # Stefan Strogin <steils@gentoo.org> (2021-06-27)
 # Requires dev-python/adblock which is not keyworded on x86 yet
 www-client/qutebrowser adblock