diff --git a/sys-cluster/mesos/mesos-1.10.0-r1.ebuild b/sys-cluster/mesos/mesos-1.10.0-r1.ebuild
index fef73e39..abd63cd0 100644
--- a/sys-cluster/mesos/mesos-1.10.0-r1.ebuild
+++ b/sys-cluster/mesos/mesos-1.10.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_1{0,1,2} )
 
 inherit autotools java-pkg-opt-2 python-any-r1 toolchain-funcs mesos
 
@@ -14,7 +14,7 @@ IUSE="master agent"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS=""
 
 # The user account "warden" is used across all Mesos/Spark/Chronos services
 # to keep the whole user account management consistent across the cluster