diff --git a/gremlin-integrations/templates/deployment.yaml b/gremlin-integrations/templates/deployment.yaml
index 79e2492..2d08618 100644
--- a/gremlin-integrations/templates/deployment.yaml
+++ b/gremlin-integrations/templates/deployment.yaml
@@ -68,6 +68,8 @@ spec:
               value: {{ .Values.gremlin.secret.key }}
               {{- end }}
           {{- end }}
+            - name: GREMLIN_CLIENT_TAGS
+              value: {{ .Values.gremlin.client.tags }}
           {{- if .Values.gremlin.allowList }}
             - name: GREMLIN_INTEGRATION_AGENT_ALLOW_LIST
               value: {{ .Values.gremlin.allowList }}
diff --git a/gremlin-integrations/values.yaml b/gremlin-integrations/values.yaml
index 9ce7463..f2e2ba6 100644
--- a/gremlin-integrations/values.yaml
+++ b/gremlin-integrations/values.yaml
@@ -82,3 +82,10 @@ gremlin:
   # gremlin.extraEnv
   # Specify any arbitrary environment variables to pass to the Gremlin Integrations Agent deployment
   extraEnv: []
+
+  client:
+    # gremlin.client.tags -
+    # A string of comma separated key=value pairs that are used to decorate the Gremlin agent with tags.
+    #
+    # NOTE: This value's commas must be escaped. See https://github.com/gremlin/helm/issues/8
+    tags: ""