diff --git a/charts/clearml/Chart.yaml b/charts/clearml/Chart.yaml
index 53d5f64..b5926b8 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: "2.3.0"
+version: "2.4.0"
 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 c3f75eb..92e4c24 100644
--- a/charts/clearml/README.md
+++ b/charts/clearml/README.md
@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes
 
-![Version: 2.3.0](https://img.shields.io/badge/Version-2.3.0-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: 2.4.0](https://img.shields.io/badge/Version-2.4.0-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
 
@@ -121,6 +121,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | agentGroups.agent-group-cpu.clearmlGitPassword | string | `nil` |  |
 | agentGroups.agent-group-cpu.clearmlGitUser | string | `nil` |  |
 | agentGroups.agent-group-cpu.clearmlSecretKey | string | `nil` |  |
+| agentGroups.agent-group-cpu.enabled | bool | `true` |  |
 | agentGroups.agent-group-cpu.image.pullPolicy | string | `"IfNotPresent"` |  |
 | agentGroups.agent-group-cpu.image.repository | string | `"ubuntu"` |  |
 | agentGroups.agent-group-cpu.image.tag | string | `"18.04"` |  |
@@ -144,6 +145,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | agentGroups.agent-group-gpu.clearmlGitPassword | string | `nil` |  |
 | agentGroups.agent-group-gpu.clearmlGitUser | string | `nil` |  |
 | agentGroups.agent-group-gpu.clearmlSecretKey | string | `nil` |  |
+| agentGroups.agent-group-gpu.enabled | bool | `true` |  |
 | agentGroups.agent-group-gpu.image.pullPolicy | string | `"IfNotPresent"` |  |
 | agentGroups.agent-group-gpu.image.repository | string | `"nvidia/cuda"` |  |
 | agentGroups.agent-group-gpu.image.tag | string | `"11.0-base-ubuntu18.04"` |  |
diff --git a/charts/clearml/templates/deployment-agent.yaml b/charts/clearml/templates/deployment-agent.yaml
index 71c6753..b146822 100644
--- a/charts/clearml/templates/deployment-agent.yaml
+++ b/charts/clearml/templates/deployment-agent.yaml
@@ -1,5 +1,6 @@
 {{- range $key, $value := .Values.agentGroups }}
 {{- with $value }}
+{{- if .enabled }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -114,3 +115,4 @@ spec:
       {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/clearml/values.yaml b/charts/clearml/values.yaml
index 87c989f..c0ce81b 100644
--- a/charts/clearml/values.yaml
+++ b/charts/clearml/values.yaml
@@ -188,6 +188,7 @@ agentservices:
 
 agentGroups:
   agent-group-cpu:
+    enabled: true
     name: agent-group-cpu
     replicaCount: 1
     updateStrategy: Recreate
@@ -221,6 +222,7 @@ agentGroups:
     affinity: {}
 
   agent-group-gpu:
+    enabled: true
     name: agent-group-gpu
     replicaCount: 0
     updateStrategy: Recreate