diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 2616ff75d985c..f6787865f83b4 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -80,10 +80,6 @@ sys-boot/grub -libzfs
 # [cuda] is unmasked in this profiles.
 media-libs/opencv -contrib_xfeatures2d
 
-# Brian Evans <grknight@gentoo.org> (21 Jul 2017)
-# app-crypt/argon2 is keyworded on amd64
-dev-lang/php -argon2
-
 # David Seifert <soap@gentoo.org> (20 May 2017)
 # cpyrit-cuda does not support GCC 4.9 or later
 net-wireless/pyrit cuda
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 0e64bc45ebd66..48d019f71273d 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans <grknight@gentoo.org> (06 Dec 2018)
+# Unmask argon2 for php
+dev-lang/php -argon2
+
 # Mikle Kolyada <zlogene@gentoo.org> (07 Nov 2018)
 # unmask sssd for sudo
 app-admin/sudo -sssd
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 672a44d0c174e..c634b31e623af 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -95,10 +95,6 @@ media-gfx/digikam mediaplayer
 # Requires USE=cuda that is masked in this profile.
 media-gfx/blender opensubdiv
 
-# Brian Evans <grknight@gentoo.org> (21 Jul 2017)
-# app-crypt/argon2 is keyworded on x86
-dev-lang/php -argon2
-
 # Thomas Deutschmann <whissi@gentoo.org> (01 Mar 2017)
 # dev-libs/libmaxminddb is keyworded on x86
 app-admin/rsyslog -mdblookup
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index fd6e0af88231e..201511485afd5 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans <grknight@gentoo.org> (06 Dec 2018)
+# Unmask argon2 for php
+dev-lang/php -argon2
+
 # Mikle Kolyada <zlogene@gentoo.org> (07 Nov 2018)
 # unmask sssd for sudo
 app-admin/sudo -sssd
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index b5ed1b31eb731..0bb2172a7ecd5 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -215,10 +215,6 @@ app-emulation/libvirt openvz
 # until upstream fixes it properly.
 sys-devel/clang z3
 
-# Brian Evans <grknight@gentoo.org> (21 Jul 2017)
-# Mask USE flag which has limited keywords for app-crypt/argon2
-dev-lang/php argon2
-
 # Mike Gilbert <floppym@gentoo.org> (09 Jul 2017)
 # Matthias Dahl <matthias.dahl@binary-island.eu> (05 Jul 2017)
 # Both are not your typical garden-variety Linux programs and are
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index be3419541d8d8..48dfc33ec0628 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Brian Evans <grknight@gentoo.org> (06 Dec 2018)
+# Mask USE flag since argon2 dependency is not stable on most arches
+dev-lang/php argon2
+
 # Mikle Kolyada <zlogene@gentoo.org> (07 Nov 2018)
 # sssd is only stable for amd64 and x86
 app-admin/sudo sssd