diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae3e266c2d..3833944148 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -85,6 +85,19 @@ it will be removed; but as it won't be user-visible this isn't considered a brea
 
 ## RELEASE NOTES
 
+## [3.11.0] TBD
+[3.11.0]: https://github.com/emissary-ingress/emissary/compare/v3.10.0...v3.11.0
+
+### Emissary-ingress and Ambassador Edge Stack
+
+- Feature: This upgrades Emissary-ingress to be built on Envoy v1.30.2 which provides security,
+  performance and feature enhancements. You can read more about them here: <a
+  href="https://www.envoyproxy.io/docs/envoy/v1.30.2/version_history/version_history">Envoy Proxy
+  1.28.0 Release Notes</a>
+
+- Change: Upgraded Emissary-ingress to the latest release of Golang as part of our general
+  dependency upgrade process.
+
 ## [3.10.0] TBD
 [3.10.0]: https://github.com/emissary-ingress/emissary/compare/v3.9.0...v3.10.0
 
diff --git a/charts/emissary-ingress/CHANGELOG.md b/charts/emissary-ingress/CHANGELOG.md
index 97afea2fe1..d927ef0196 100644
--- a/charts/emissary-ingress/CHANGELOG.md
+++ b/charts/emissary-ingress/CHANGELOG.md
@@ -3,6 +3,10 @@
 This file documents all notable changes to Ambassador Helm Chart. The release
 numbering uses [semantic versioning](http://semver.org).
 
+## v8.11.0 - TBD
+
+- Upgrade Emissary to v3.11.0 [CHANGELOG](https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md)
+
 ## v8.10.0 - TBD
 
 - Upgrade Emissary to v3.10.0 [CHANGELOG](https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md)
diff --git a/docs/releaseNotes.yml b/docs/releaseNotes.yml
index 32da6bfed0..8f1f85171b 100644
--- a/docs/releaseNotes.yml
+++ b/docs/releaseNotes.yml
@@ -32,6 +32,23 @@
 
 changelog: https://github.com/emissary-ingress/emissary/blob/$branch$/CHANGELOG.md
 items:
+  - version: 3.11.0
+    prevVersion: 3.10.0
+    date: 'TBD'
+    notes:
+      - title: Upgrade to Envoy 1.30.2
+        type: feature
+        body: >-
+          This upgrades $productName$ to be built on Envoy v1.30.2 which provides security, performance
+          and feature enhancements. You can read more about them here:
+          <a href="https://www.envoyproxy.io/docs/envoy/v1.30.2/version_history/version_history">Envoy Proxy 1.28.0 Release Notes</a>
+        docs: https://www.envoyproxy.io/docs/envoy/v1.30.2/version_history/version_history
+
+      - title: Update to golang 1.22.4
+        type: change
+        body: >-
+          Upgraded $productName$ to the latest release of Golang as part of our general dependency upgrade process.
+
   - version: 3.10.0
     prevVersion: 3.9.0
     date: 'TBD'