diff --git a/README.md b/README.md
index d4618db..4cdd33c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,2 @@
 # detach-keystone
 Plugin to detach Keystone from controller role
-
-Because of limitations in Fuel's granular deployment and keystone's DB dependency,
-this plugin must be installed and activated alongside with the detach-database plugin.
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index d7acd87..2c85ce5 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -137,8 +137,7 @@
   required_for: [keystone, primary-keystone]
   requires: [hosts]
   cross-depends:
-    - name: /(primary-)?database/
-      role: primary-controller
+    - name: /^(primary-)?database$/
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/keystone/db.pp
     puppet_modules: /etc/puppet/modules