diff --git a/app-editors/atom/atom-1.58.0.ebuild b/app-editors/atom/atom-1.58.0.ebuild
index 1d235bf..e448880 100644
--- a/app-editors/atom/atom-1.58.0.ebuild
+++ b/app-editors/atom/atom-1.58.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop bintron
 
diff --git a/app-editors/vscode/vscode-1.61.1.ebuild b/app-editors/vscode/vscode-1.61.1.ebuild
index 8bd3a32..6657eeb 100644
--- a/app-editors/vscode/vscode-1.61.1.ebuild
+++ b/app-editors/vscode/vscode-1.61.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit bintron desktop
 
diff --git a/dev-util/beekeeper-studio/beekeeper-studio-2.1.4.ebuild b/dev-util/beekeeper-studio/beekeeper-studio-2.1.4.ebuild
index 6664751..9293820 100644
--- a/dev-util/beekeeper-studio/beekeeper-studio-2.1.4.ebuild
+++ b/dev-util/beekeeper-studio/beekeeper-studio-2.1.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop unpacker bintron
 
diff --git a/dev-util/github-desktop/github-desktop-2.9.3.ebuild b/dev-util/github-desktop/github-desktop-2.9.3.ebuild
index 22c659e..62d528e 100644
--- a/dev-util/github-desktop/github-desktop-2.9.3.ebuild
+++ b/dev-util/github-desktop/github-desktop-2.9.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop unpacker bintron
 
diff --git a/eclass/bintron.eclass b/eclass/bintron.eclass
index 8d85a74..d515962 100644
--- a/eclass/bintron.eclass
+++ b/eclass/bintron.eclass
@@ -24,7 +24,7 @@ in
 	[0-6] )
 		die "EAPI: ${EAPI} too old"
 		;;
-	7 )
+	[7-8] )
 		true
 		;;
 	* )