diff --git a/gui-apps/1password/1password-8.10.3.ebuild b/gui-apps/1password/1password-8.10.3.ebuild
index b4f9bf99a9..ebdb98bc25 100644
--- a/gui-apps/1password/1password-8.10.3.ebuild
+++ b/gui-apps/1password/1password-8.10.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit rpm xdg-utils
+inherit rpm xdg-utils optfeature
 
 DESCRIPTION="The world’s most-loved password manager"
 HOMEPAGE="https://1password.com"
@@ -15,13 +15,9 @@ KEYWORDS="~amd64"
 
 RESTRICT="mirror strip test bindist"
 
-IUSE="+policykit +cli"
-
 DEPEND="
 	x11-misc/xdg-utils
 	acct-group/1password
-	policykit? ( sys-auth/polkit )
-	cli? ( app-misc/1password-cli )
 "
 RDEPEND="${DEPEND}"
 BDEPEND=""
@@ -54,6 +50,9 @@ pkg_postinst() {
 	xdg_icon_cache_update
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
+
+	optfeature "cli support" app-misc/1password-cli
+	optfeature "policykit support" sys-auth/polkit
 }
 
 pkg_postrm() {
diff --git a/gui-apps/1password/metadata.xml b/gui-apps/1password/metadata.xml
index d79ec03ede..4b04391722 100644
--- a/gui-apps/1password/metadata.xml
+++ b/gui-apps/1password/metadata.xml
@@ -5,7 +5,4 @@
 		<email>zdanevich.vitaly@ya.ru</email>
 		<name>Vitaly Zdanevich</name>
 	</maintainer>
-	<use>
-		<flag name="cli">Install app-misc/1password-cli</flag>
-	</use>
 </pkgmetadata>