diff --git a/charts/clearml-agent/Chart.yaml b/charts/clearml-agent/Chart.yaml
index 8c419f3..aaa1a62 100644
--- a/charts/clearml-agent/Chart.yaml
+++ b/charts/clearml-agent/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: clearml-agent
 description: MLOps platform
 type: application
-version: "3.1.1"
+version: "3.1.2"
 appVersion: "1.24"
 kubeVersion: ">= 1.19.0-0 < 1.26.0-0"
 home: https://clear.ml
diff --git a/charts/clearml-agent/README.md b/charts/clearml-agent/README.md
index 8a07795..03530c3 100644
--- a/charts/clearml-agent/README.md
+++ b/charts/clearml-agent/README.md
@@ -1,6 +1,6 @@
 # ClearML Kubernetes Agent
 
-![Version: 3.1.1](https://img.shields.io/badge/Version-3.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.24](https://img.shields.io/badge/AppVersion-1.24-informational?style=flat-square)
+![Version: 3.1.2](https://img.shields.io/badge/Version-3.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.24](https://img.shields.io/badge/AppVersion-1.24-informational?style=flat-square)
 
 MLOps platform
 
diff --git a/charts/clearml-agent/templates/agentk8sglue-configmap.yaml b/charts/clearml-agent/templates/agentk8sglue-configmap.yaml
index 7c5eb46..62ae17a 100644
--- a/charts/clearml-agent/templates/agentk8sglue-configmap.yaml
+++ b/charts/clearml-agent/templates/agentk8sglue-configmap.yaml
@@ -119,7 +119,7 @@ data:
               value: {{ $.Values.agentk8sglue.webServerUrlReference }}
             - name: CLEARML_FILES_HOST
               value: {{ $.Values.agentk8sglue.fileServerUrlReference }}
-            {{- if not $.Values.agentk8sglue.useOwnerToken }}
+            {{- if not $.Values.enterpriseFeatures.useOwnerToken }}
             - name: CLEARML_API_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
@@ -174,7 +174,7 @@ data:
         {{- end }}
     {{- end }}
   secrets.yaml: |
-    {{- range $key, $value := $.Values.agentk8sglue.queues }}
+    {{- range $key, $value := $.Values.enterpriseFeatures.queues }}
     {{ $key }}:
       {{- if $value.templateOverrides.fileMounts }}
         - {{ include "clearml.name" $ }}-{{ $key }}-fm