diff --git a/CHANGELOG.md b/CHANGELOG.md
index 851c3ae21..b97639016 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,27 @@
+### v2.0.4
+
+- Added: Expand allowed length of namespaces to be between 2 and 255 characters  (#2291)
+- Added: Better messaging for namespaces (#2283)
+- Added: More customization of Message Of The Day (MOTD) (#2282)
+- Added: Configurable and default timeout for LDAP (#2247)
+- Added: Custom SSL certificate panel in superuser panel (#2271, #2274)
+- Added: User and Organization list pagination on superuser panel (#2250)
+- Added: Performance improvements for georeplication queuing (#2254)
+- Added: Automatic garbage collection in security scanner (#2257)
+- Added: RECAPTCHA support during create account flow (#2245)
+- Added: Always display full git error in build logs (#2277)
+- Added: Superuser config clarification warnings (#2279)
+- Added: Performance improvements around queues (#2276, #2286, #2287)
+- Added: Automatic retry for security scanning (#2242)
+- Added: Better error messaging on security scanner lookup failure (#2235)
+- Added: Ensure robot accounts show at top of entity autocomplete (#2243)
+
+- Fixed: Exception when autocompleting users in teams (#2255)
+- Fixed: Port mapping in ACI conversion (#2251, #2273)
+- Fixed: Error messaging for attempting to join a team with invalid email (#2240)
+- Fixed: Prometheus metrics for scale (#2237)
+- Fixed: Security scanner notification pagination (#2233, #2249)
+
 ### v2.0.3
 
 - Added: Allow extra_ca_certs to be a folder or a file (#2180)