diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2041c8525..3d296f4ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# NEXT
+
+A new mandatory option has been introduced to
+`brig` and `galley` which in the future will be used for Wire federation.  This domain name
+is *not* optional even if federation is not used.
+
+Please update your `values/wire-server/values.yaml` to set `brig.optSettings.setFederationDomain`
+and `galley.settings.federationDomain` (Note the slightly different option name).
+
+**NOTE**: These changes apply to chart version **0.129.0** and later eventhough
+this release was made later than that **0.129.0** chart was published. We're sorry for the
+inconvenience.
+
 # 2020-12-07
 
 ## Update instructions
diff --git a/values/wire-server/demo-values.example.yaml b/values/wire-server/demo-values.example.yaml
index cb6ad4cb2..4fe670a86 100644
--- a/values/wire-server/demo-values.example.yaml
+++ b/values/wire-server/demo-values.example.yaml
@@ -39,6 +39,8 @@ brig:
       teamSettings: https://teams.example.com # change this (on unset if team settings are not used)
       teamCreatorWelcome: https://teams.example.com/login # change this
       teamMemberWelcome: https://wire.example.com/download # change this
+    optSettings:
+      setFederationDomain: example.com # change this
     emailSMS:
       general:
         emailSender: email@example.com # change this
@@ -104,6 +106,7 @@ galley:
       host: cassandra-ephemeral
       replicaCount: 1
     settings:
+      federationDomain: example.com # change this
       # prefix URI used when inviting users to a conversation by link
       conversationCodeURI: https://example.com/join/ # change this
     aws:
diff --git a/values/wire-server/prod-values.example.yaml b/values/wire-server/prod-values.example.yaml
index 0492918a8..1e12f737b 100644
--- a/values/wire-server/prod-values.example.yaml
+++ b/values/wire-server/prod-values.example.yaml
@@ -40,6 +40,8 @@ brig:
       teamSettings: https://teams.example.com # change this (or unset if team settings are not used)
       teamCreatorWelcome: https://teams.example.com/login # change this
       teamMemberWelcome: https://wire.example.com/download # change this
+    optSettings:
+      setFederationDomain: example.com # change this
     emailSMS:
       general:
         emailSender: email@example.com # change this
@@ -136,6 +138,7 @@ galley:
     settings:
       # prefix URI used when inviting users to a conversation by link
       conversationCodeURI: https://webapp.example.com/join/ # change this
+      federationDomain: example.com # change this
       # see #RefConfigOptions in `/docs/reference` (https://github.com/wireapp/wire-server/)
       featureFlags:
         sso: disabled-by-default