diff --git a/etc/policy.json b/etc/policy.json
index e96038ba..0521d612 100644
--- a/etc/policy.json
+++ b/etc/policy.json
@@ -1,11 +1,11 @@
 {
     "default": "!",
 
-    "admin": "role:admin and tenant:admin or role:admin and tenant:service or role:admin and tenant:ranger",
-    "admin_support": "role:admin_support and tenant:admin or role:admin_support and tenant:service or role:admin_support and tenant:ranger",
-    "admin_viewer": "role:admin_viewer and tenant:admin or role:admin_viewer and tenant:service or role:admin_viewer and tenant:ranger",
-    "flavor_creator": "role:ranger_flavor_creator and tenant:admin or role:ranger_flavor_creator and tenant:service or role:ranger_flavor_creator and tenant:ranger",
-    "customer_creator": "role:ranger_customer_creator and tenant:admin or role:ranger_customer_creator and tenant:service or role:ranger_flavor_creator and tenant:ranger",
+    "admin": "role:admin and tenant:admin or role:admin and tenant:service or role:admin and tenant:aqua-admin",
+    "admin_support": "role:admin_support and tenant:admin or role:admin_support and tenant:service or role:admin_support and tenant:aqua-admin",
+    "admin_viewer": "role:admin_viewer and tenant:admin or role:admin_viewer and tenant:service or role:admin_viewer and tenant:aqua-admin",
+    "flavor_creator": "role:ranger_flavor_creator and tenant:admin or role:ranger_flavor_creator and tenant:service or role:ranger_flavor_creator and tenant:aqua-admin",
+    "customer_creator": "role:ranger_customer_creator and tenant:admin or role:ranger_customer_creator and tenant:service or role:ranger_flavor_creator and tenant:aqua-admin",
 
     "admin_or_flavor_creator": "rule:admin or rule:flavor_creator",
     "admin_or_customer_creator": "rule:admin or rule:customer_creator",