diff --git a/profiles/server/package.accept_keywords b/profiles/server/package.accept_keywords
index 809d077a..3a38ecdd 100644
--- a/profiles/server/package.accept_keywords
+++ b/profiles/server/package.accept_keywords
@@ -198,6 +198,7 @@ sys-apps/microcode-data ~amd64
 <sys-apps/portage-2.3 **
 sys-apps/util-linux ~amd64
 sys-auth/keystone ~amd64
+=sys-auth/keystone-2014.1.9999 **
 sys-boot/efibootmgr ~amd64
 sys-boot/os-prober ~amd64
 sys-block/whdd ~amd64
diff --git a/profiles/server/package.mask b/profiles/server/package.mask
index 262fdc56..2e17dac3 100644
--- a/profiles/server/package.mask
+++ b/profiles/server/package.mask
@@ -3,3 +3,7 @@
 # Waiting for udev to be fully populated
 # udev-217,udev-init-scripts-27,openrc-0.12.4
 =sys-apps/kmod-18-r2
+
+# OpenStack dependency conflicts
+=dev-python/sqlalchemy-migrate-0.9.2
+>=sys-auth/keystone-2014.2