diff --git a/charts/clearml/Chart.yaml b/charts/clearml/Chart.yaml
index d21cfce..a8bf1c9 100644
--- a/charts/clearml/Chart.yaml
+++ b/charts/clearml/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "3.0.3"
+version: "3.0.4"
 appVersion: "1.1.1"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
diff --git a/charts/clearml/README.md b/charts/clearml/README.md
index 10dcdaf..2b1fb21 100644
--- a/charts/clearml/README.md
+++ b/charts/clearml/README.md
@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes
 
-![Version: 3.0.3](https://img.shields.io/badge/Version-3.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.1](https://img.shields.io/badge/AppVersion-1.1.1-informational?style=flat-square)
+![Version: 3.0.4](https://img.shields.io/badge/Version-3.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.1](https://img.shields.io/badge/AppVersion-1.1.1-informational?style=flat-square)
 
 MLOps platform
 
@@ -170,6 +170,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | agentservices.clearmlHostIp | string | `nil` |  |
 | agentservices.clearmlWebHost | string | `nil` |  |
 | agentservices.clearmlWorkerId | string | `"clearml-services"` |  |
+| agentservices.enabled | bool | `false` |  |
 | agentservices.extraEnvs | list | `[]` |  |
 | agentservices.googleCredentials | string | `nil` |  |
 | agentservices.image.pullPolicy | string | `"IfNotPresent"` |  |
diff --git a/charts/clearml/templates/deployment-agentservices.yaml b/charts/clearml/templates/deployment-agentservices.yaml
index 890a209..5debc30 100644
--- a/charts/clearml/templates/deployment-agentservices.yaml
+++ b/charts/clearml/templates/deployment-agentservices.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.agentservices.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -98,3 +99,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+{{- end }}
diff --git a/charts/clearml/templates/pvc-agentservices.yaml b/charts/clearml/templates/pvc-agentservices.yaml
index 47dc2f4..fa1d023 100644
--- a/charts/clearml/templates/pvc-agentservices.yaml
+++ b/charts/clearml/templates/pvc-agentservices.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.agentservices.enabled }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
@@ -11,3 +12,4 @@ spec:
     requests:
       storage: {{ .Values.agentservices.storage.data.size | quote }}
   storageClassName: {{ .Values.agentservices.storage.data.class | quote }}
+{{- end }}
diff --git a/charts/clearml/values.yaml b/charts/clearml/values.yaml
index 03dd22f..361611a 100644
--- a/charts/clearml/values.yaml
+++ b/charts/clearml/values.yaml
@@ -141,6 +141,7 @@ webserver:
   affinity: {}
 
 agentservices:
+  enabled: false
   clearmlHostIp: null
   agentVersion: ""
   clearmlWebHost: null