diff --git a/helm/kagent-tools/templates/deployment.yaml b/helm/kagent-tools/templates/deployment.yaml
index ec8b8a8..6fbd59c 100644
--- a/helm/kagent-tools/templates/deployment.yaml
+++ b/helm/kagent-tools/templates/deployment.yaml
@@ -59,6 +59,12 @@ spec:
           args:
           - "--port"
           - "{{ .Values.service.ports.tools.targetPort }}"
+          {{- if .Values.tools.enabledTools }}
+          - "--tools={{ join "," .Values.tools.enabledTools }}"
+          {{- end }}
+          {{- with .Values.tools.extraArgs }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.tools.image.registry }}/{{ .Values.tools.image.repository }}:{{ coalesce .Values.global.tag .Values.tools.image.tag .Chart.Version }}"
diff --git a/helm/kagent-tools/values.yaml b/helm/kagent-tools/values.yaml
index 40262a7..a9e6ba6 100644
--- a/helm/kagent-tools/values.yaml
+++ b/helm/kagent-tools/values.yaml
@@ -6,6 +6,15 @@ global:
 
 tools:
   loglevel: "debug"
+  # List of tool providers to enable. Empty list means all tools are enabled.
+  # Available: k8s, helm, istio, cilium, argo, prometheus, kubescape, utils
+  enabledTools: []
+  #  - k8s
+  #  - helm
+  #  - prometheus
+  # Additional command-line arguments
+  extraArgs: []
+  #  - "--some-future-flag"
   image:
     registry: ghcr.io
     repository: kagent-dev/kagent/tools