diff --git a/devstack/lib/magnum b/devstack/lib/magnum
index 3e690de3f2..62a75df4dc 100644
--- a/devstack/lib/magnum
+++ b/devstack/lib/magnum
@@ -229,7 +229,7 @@ function create_api_paste_conf {
 function update_heat_policy {
     # enable stacks global_index search so that magnum can use
     # list(global_tenant=True)
-    sed -i 's/\("stacks:global_index":\).*$/\1 "role:admin",/' $HEAT_CONF_DIR/policy.json
+    sed -i 's/\("stacks:global_index":\).*$/\1 "rule:context_is_admin",/' $HEAT_CONF_DIR/policy.json
 }
 
 # create_magnum_cache_dir() - Part of the init_magnum() process
diff --git a/doc/source/userguide.rst b/doc/source/userguide.rst
index 9358e54319..f80368e56e 100644
--- a/doc/source/userguide.rst
+++ b/doc/source/userguide.rst
@@ -1675,7 +1675,7 @@ it for Magnum. If you want to enable it nonetheless, proceed as follows:
    .. code-block:: ini
 
       ...
-      stacks:global_index: "role:admin",
+      stacks:global_index: "rule:context_is_admin",
 
    Now restart heat.