diff --git a/CHANGELOG.md b/CHANGELOG.md
index 667ace6378..f37856cbf2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,13 +80,6 @@ it will be removed; but as it won't be user-visible this isn't considered a brea
 - Feature: The agent is now able to parse api contracts using swagger 2, and to convert them to
   OpenAPI 3, making them available for use in the dev portal.
 
-- Feature: The agent now has the ability to report diagnostics information to Ambassador Cloud. If
-  you previously connected your installation to Ambassador Cloud, you may choose to enable this
-  functionality by setting the following environment variables on your agent `Deployment`:
-  `AES_REPORT_DIAGNOSTICS_TO_CLOUD=true`,
-  `AES_DIAGNOSTICS_URL="http://[ambassador-admin]:8877/ambassador/v0/diag/?json=true"`. This
-  capability is enabled by default in the standard published `.yaml` files and Helm chart.
-
 - Change: In the standard published `.yaml` files, the `Module` resource enables serving remote
   client requests to the `:8877/ambassador/v0/diag/` endpoint. The associated Helm chart release
   also now enables it by default.
diff --git a/charts/emissary-ingress/CHANGELOG.md b/charts/emissary-ingress/CHANGELOG.md
index a185c3097c..a72d88503a 100644
--- a/charts/emissary-ingress/CHANGELOG.md
+++ b/charts/emissary-ingress/CHANGELOG.md
@@ -5,7 +5,6 @@ numbering uses [semantic versioning](http://semver.org).
 
 ## Next Release
 
-- Feature: The Agent Deployment is now configured to report diagnostics information to Ambassador Cloud by default.
 - Change: The default for the `module` value has changed to enable serving remote client requests to the <code>:8877/ambassador/v0/diag/</code> endpoint by default.
 
 ## v8.0.0
diff --git a/charts/emissary-ingress/templates/ambassador-agent.yaml b/charts/emissary-ingress/templates/ambassador-agent.yaml
index 2b26ec7c00..5051f17f5e 100644
--- a/charts/emissary-ingress/templates/ambassador-agent.yaml
+++ b/charts/emissary-ingress/templates/ambassador-agent.yaml
@@ -241,14 +241,8 @@ spec:
           value: {{ include "ambassador.fullname" . }}-agent-cloud-token
         - name: RPC_CONNECTION_ADDRESS
           value: {{ .Values.agent.rpcAddress }}
-        {{- if .Values.agent.diagnostics }}
-        - name: AES_REPORT_DIAGNOSTICS_TO_CLOUD
-          value: "true"
-        {{- end }}
         - name: AES_SNAPSHOT_URL
           value: "http://{{ include "ambassador.fullname" . }}-admin.{{ include "ambassador.namespace" . }}:{{ .Values.adminService.snapshotPort }}/snapshot-external"
-        - name: AES_DIAGNOSTICS_URL
-          value: "http://{{ include "ambassador.fullname" . }}-admin.{{ include "ambassador.namespace" . }}:{{ .Values.adminService.port }}/ambassador/v0/diag/?json=true"
   {{ if .Values.progressDeadlines }}
   {{ if hasKey .Values.progressDeadlines "agent" }}
   progressDeadlineSeconds: {{ .Values.progressDeadlines.agent }}
diff --git a/charts/emissary-ingress/values.yaml.in b/charts/emissary-ingress/values.yaml.in
index 93ca315dda..4f7f7a1c47 100644
--- a/charts/emissary-ingress/values.yaml.in
+++ b/charts/emissary-ingress/values.yaml.in
@@ -388,8 +388,6 @@ prometheusExporter: # +doc-gen:break
 agent:
   # If `true`, installs the ambassador-agent Deployment, ServiceAccount and ClusterRole in the ambassador namespace, enabling the Ambassador Cloud connectivity.
   enabled: true
-  # If `true`, will report diagnostics information.
-  diagnostics: true
   # API token for reporting snapshots to [Ambassador Cloud](https://app.getambassador.io/cloud/);
   # If empty, agent will not report snapshots
   cloudConnectToken: ''
diff --git a/docs/releaseNotes.yml b/docs/releaseNotes.yml
index 70ac685f7a..c692c6d1c3 100644
--- a/docs/releaseNotes.yml
+++ b/docs/releaseNotes.yml
@@ -40,16 +40,6 @@ items:
         body: >-
           The agent is now able to parse api contracts using swagger 2, and to convert them to OpenAPI 3, making them
           available for use in the dev portal.
-      - title:
-        type: feature
-        body: >-
-          The agent now has the ability to report diagnostics information to Ambassador Cloud.
-          If you previously connected your installation to Ambassador Cloud, you may choose to enable this functionality
-          by setting the following environment variables on your agent <code>Deployment</code>:
-          <code>AES_REPORT_DIAGNOSTICS_TO_CLOUD=true</code>,
-          <code>AES_DIAGNOSTICS_URL="http://[ambassador-admin]:8877/ambassador/v0/diag/?json=true"</code>.
-          This capability is enabled by default in the standard published <code>.yaml</code> files and Helm chart.
-        docs: ../../../cloud/latest/service-catalog/reference/diagnostics/
       - title: Default YAML enables the diagnostics interface from non-local clients on the admin service port
         type: change
         body: >-
diff --git a/manifests/emissary/emissary-defaultns.yaml.in b/manifests/emissary/emissary-defaultns.yaml.in
index 3896520693..c91f38aa45 100644
--- a/manifests/emissary/emissary-defaultns.yaml.in
+++ b/manifests/emissary/emissary-defaultns.yaml.in
@@ -636,12 +636,8 @@ spec:
           value: emissary-ingress-agent-cloud-token
         - name: RPC_CONNECTION_ADDRESS
           value: https://app.getambassador.io/
-        - name: AES_REPORT_DIAGNOSTICS_TO_CLOUD
-          value: "true"
         - name: AES_SNAPSHOT_URL
           value: http://emissary-ingress-admin.default:8005/snapshot-external
-        - name: AES_DIAGNOSTICS_URL
-          value: http://emissary-ingress-admin.default:8877/ambassador/v0/diag/?json=true
         image: $imageRepo$:$version$
         imagePullPolicy: IfNotPresent
         name: agent
diff --git a/manifests/emissary/emissary-emissaryns.yaml.in b/manifests/emissary/emissary-emissaryns.yaml.in
index 10f09fb321..7dc30f0b7d 100644
--- a/manifests/emissary/emissary-emissaryns.yaml.in
+++ b/manifests/emissary/emissary-emissaryns.yaml.in
@@ -636,12 +636,8 @@ spec:
           value: emissary-ingress-agent-cloud-token
         - name: RPC_CONNECTION_ADDRESS
           value: https://app.getambassador.io/
-        - name: AES_REPORT_DIAGNOSTICS_TO_CLOUD
-          value: "true"
         - name: AES_SNAPSHOT_URL
           value: http://emissary-ingress-admin.emissary:8005/snapshot-external
-        - name: AES_DIAGNOSTICS_URL
-          value: http://emissary-ingress-admin.emissary:8877/ambassador/v0/diag/?json=true
         image: $imageRepo$:$version$
         imagePullPolicy: IfNotPresent
         name: agent