diff --git a/aether-roc-api/Chart.yaml b/aether-roc-api/Chart.yaml
index f0d7a49..2969bf2 100644
--- a/aether-roc-api/Chart.yaml
+++ b/aether-roc-api/Chart.yaml
@@ -7,8 +7,8 @@
 description: Aether ROC API
 kubeVersion: ">=1.15.0"
 type: application
-version: 1.4.3
-appVersion: v0.9.4
+version: 1.4.4
+appVersion: v0.9.5
 keywords:
   - aether
   - config
diff --git a/aether-roc-api/values.yaml b/aether-roc-api/values.yaml
index 1b29115..2151d06 100644
--- a/aether-roc-api/values.yaml
+++ b/aether-roc-api/values.yaml
@@ -10,7 +10,7 @@
 
 image:
   repository: onosproject/aether-roc-api
-  tag: v0.9.4
+  tag: v0.9.5
   pullPolicy: IfNotPresent
   pullSecrets: []
 
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index cd6d3ee..8eb5e02 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
 description: Aether ROC Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 2.0.13
+version: 2.0.14
 appVersion: v0.0.0
 keywords:
   - aether
@@ -49,7 +49,7 @@
   - name: aether-roc-api
     condition: import.aether-roc-api.enabled
     repository: "file://../aether-roc-api"
-    version: 1.4.3
+    version: 1.4.4
   - name: aether-roc-websocket
     condition: import.aether-roc-websocket.enabled
     repository: "file://../aether-roc-websocket"
diff --git a/aether-roc-umbrella/files/opa-rbac/aether-2.0.0.rego b/aether-roc-umbrella/files/opa-rbac/aether-2.0.0.rego
index 6689a0b..171ba6a 100644
--- a/aether-roc-umbrella/files/opa-rbac/aether-2.0.0.rego
+++ b/aether-roc-umbrella/files/opa-rbac/aether-2.0.0.rego
@@ -22,10 +22,10 @@
 
 enterprise_rule[enterprise] {
     enterprise := input.enterprises.enterprise[_]
-    ["AetherROCAdmin", enterprise.ent_id][_] == input.groups[i]
+    ["AetherROCAdmin", enterprise.enterprise_id][_] == input.groups[i]
 }
 
 can_update_enterprise = true {
     update_enterprise := input.updates.enterprises.enterprise[_]
-    ["AetherROCAdmin", update_enterprise.ent_id][_] == input.groups[i]
+    ["AetherROCAdmin", update_enterprise.enterprise_id][_] == input.groups[i]
 }