diff --git a/helm/ambassador-agent/templates/deployment.yaml b/helm/ambassador-agent/templates/deployment.yaml
index ac3c5bc..c75aeb8 100644
--- a/helm/ambassador-agent/templates/deployment.yaml
+++ b/helm/ambassador-agent/templates/deployment.yaml
@@ -56,7 +56,11 @@ spec:
             {{- with .Values.edgestack.agent }}
             - name: AES_SNAPSHOT_URL
               value: "http://{{ required "A value must be entered for all edgestack.agent entries" .name  }}-admin.{{ required "A value must be entered for all edgestack.agent entries" .namespace }}:{{ required "A value must be entered for all edgestack.agent entries" .snapshotPort }}/snapshot-external"
+            - name: AES_DIAGNOSTICS_URL
+              value: "http://{{ required "A value must be entered for all edgestack.agent entries" .name  }}-admin.{{ required "A value must be entered for all edgestack.agent entries" .namespace }}:{{ required "A value must be entered for all edgestack.agent entries" .diagnosticsPort }}/ambassador/v0/diag/?json=true"
             {{- end }}
+            - name: AES_REPORT_DIAGNOSTICS_TO_CLOUD
+              value: {{ .Values.edgestack.agent.reportDiagnostics | default "true"  }}
             {{- end }}
             {{- end }}
             {{ if .Values.rbac.namespaces }}
diff --git a/helm/ambassador-agent/values.yaml b/helm/ambassador-agent/values.yaml
index e3a0962..4687ffa 100644
--- a/helm/ambassador-agent/values.yaml
+++ b/helm/ambassador-agent/values.yaml
@@ -58,10 +58,12 @@ autoscaling:
   # targetMemoryUtilizationPercentage: 80
 
 edgestack:
-#  agent:
-#    name:
-#    namespace:
-#    snapshotPort:
+# agent:
+#   name:
+#   namespace: 
+#   snapshotPort: 
+#   diagnosticsPort: 
+#   reportDiagnostics: 
 
 rpcAddress: ""