diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e34dfb523..8f0e861a1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,96 +6,8 @@ be found.
 
 ## 18.03.0-ce (2018-03-DD)
 
-### --Delete--
-* Bump VERSION to 18.03.0-dev [docker/cli#852](https://github.com/docker/cli/pull/852)
-* Golint fix with ro_layer.go [moby/moby#36105](https://github.com/moby/moby/pull/36105)
-* Integration/TestUpdateMemory: fix false failure [moby/moby#36361](https://github.com/moby/moby/pull/36361)
-* Migrate TestAPIStatsContainerGetMemoryLimit from integration-cli to api tests [moby/moby#36178](https://github.com/moby/moby/pull/36178)
-* Migrate TestAPIUpdateContainer from integration-cli to api tests [moby/moby#36166](https://github.com/moby/moby/pull/36166)
-* Migrate TestAuthAPI from integration-cli to integration [moby/moby#36152](https://github.com/moby/moby/pull/36152)
-* Migrate TestCreateTmpfsMountsTarget test to api test [moby/moby#36241](https://github.com/moby/moby/pull/36241)
-* Migrate TestKillDifferentUserContainer to api test [moby/moby#36259](https://github.com/moby/moby/pull/36259)
-* Migrate TestSecretInspect from integration-cli to api tests [moby/moby#36188](https://github.com/moby/moby/pull/36188)
-* Migrate config list tests from integration-cli to api tests [moby/moby#36234](https://github.com/moby/moby/pull/36234)
-* Migrate container diff tests in integration-cli to api tests. [moby/moby#36320](https://github.com/moby/moby/pull/36320)
-* Migrate container pause tests to api tests [moby/moby#36273](https://github.com/moby/moby/pull/36273)
-* Migrate docker_api_inspect_unix_test.go to integration api test [moby/moby#36260](https://github.com/moby/moby/pull/36260)
-* Migrate docker_cli_oom_killed_test.go to api tests [moby/moby#36261](https://github.com/moby/moby/pull/36261)
-* Migrate docker_cli_stop_test.go to api test [moby/moby#36141](https://github.com/moby/moby/pull/36141)
-* Migrate rename tests in integration-cli to api tests [moby/moby#36213](https://github.com/moby/moby/pull/36213)
-* Migrate secret list tests from integration-cli to api tests [moby/moby#36221](https://github.com/moby/moby/pull/36221)
-* Migrate several resize tests from integration-cli to integration [moby/moby#36177](https://github.com/moby/moby/pull/36177)
-* Migrate some integration-cli test to api tests [moby/moby#36148](https://github.com/moby/moby/pull/36148)
-* Migrate some kill integration cli test to api tests [moby/moby#36140](https://github.com/moby/moby/pull/36140)
-* Migrate some of the nat tests in integration-cli to api tests [moby/moby#36192](https://github.com/moby/moby/pull/36192)
-* Migrate some update restart tests to api tests [moby/moby#36284](https://github.com/moby/moby/pull/36284)
-* Migrates docker info tests to integration api tests [moby/moby#36235](https://github.com/moby/moby/pull/36235)
-* Migrates session tests in integration-cli to api tests [moby/moby#36285](https://github.com/moby/moby/pull/36285)
-* Remove some maintainers 👼 [docker/cli#876](https://github.com/docker/cli/pull/876)
-* Remove some maintainers 👼 [moby/moby#36301](https://github.com/moby/moby/pull/36301)
-* Move dockerfile ENV shell parser functions into subpackage [moby/moby#36156](https://github.com/moby/moby/pull/36156)
-* Update golang.org/x/sys vendor [moby/moby#36276](https://github.com/moby/moby/pull/36276)
-* Test.md improvements and corrections [moby/moby#35898](https://github.com/moby/moby/pull/35898)
-* Cleanup unnecessary and duplicate functions in `daemon_unix.go` [moby/moby#36303](https://github.com/moby/moby/pull/36303)
-* Doc guidance to only use 256 IPs per overlay [docker/cli#851](https://github.com/docker/cli/pull/851)
-* Test: clean/migrate some docker ps cli-only integration tests [moby/moby#36330](https://github.com/moby/moby/pull/36330)
-+ Add e2e container kill test [docker/cli#841](https://github.com/docker/cli/pull/841)
-- Fix leading characters being stripped from example sections in YAML [docker/cli#564](https://github.com/docker/cli/pull/564)
-- Fix secret and config mode issue [moby/moby#36130](https://github.com/moby/moby/pull/36130)
-- Fix typo and incorrect return value in pkg [moby/moby#36299](https://github.com/moby/moby/pull/36299)
-- Fix typo in 3.6 schema ID [docker/cli#884](https://github.com/docker/cli/pull/884)
-- Fix typos in daemon directory [moby/moby#36275](https://github.com/moby/moby/pull/36275)
-- Fix vendor validation (and vendor) [docker/cli#862](https://github.com/docker/cli/pull/862)
-- Fix vendor validation [moby/moby#36190](https://github.com/moby/moby/pull/36190)
-* Update API docs to show that /containers/{id}/kill returns HTTP 409 [moby/moby#36074](https://github.com/moby/moby/pull/36074)
-* Update API version history for `Init` with `POST /containers/create` [moby/moby#36116](https://github.com/moby/moby/pull/36116)
-* Update api tests to use container.Run/Create in helper package [moby/moby#36294](https://github.com/moby/moby/pull/36294)
-* Update api tests to use the newly added container helper package [moby/moby#36279](https://github.com/moby/moby/pull/36279)
-* Update docker kill reference docs [docker/cli#264](https://github.com/docker/cli/pull/264)
-* Update docker-py to 5e28dcaace5f7b70cbe44c313b7a3b288fa38916 [moby/moby#36318](https://github.com/moby/moby/pull/36318)
-- Fix a typo in CONTRIBUTING.md [moby/moby#36132](https://github.com/moby/moby/pull/36132)
-* Make it easier to debug swagger-gen flakes [moby/moby#36193](https://github.com/moby/moby/pull/36193)
-+ Add more russian scientists in names-generator.go [moby/moby#35911](https://github.com/moby/moby/pull/35911)
-- Fix doubled word in note [docker/cli#857](https://github.com/docker/cli/pull/857)
-* Use TagImage in Commit [moby/moby#36271](https://github.com/moby/moby/pull/36271)
-* Bump Go to 1.9.3 (cont.) [docker/cli#844](https://github.com/docker/cli/pull/844)
-* Bump docker/go-connections to 98e7d807e5d804e4e42a98d74d1dd695321224ef [docker/cli#853](https://github.com/docker/cli/pull/853)
-* Bump docker/go-connections to 98e7d807e5d804e4e42a98d74d1dd695321224ef [moby/moby#36163](https://github.com/moby/moby/pull/36163)
-+ Add an example for --with-registry-auth [docker/cli#858](https://github.com/docker/cli/pull/858)
-* Improve man pages [docker/cli#875](https://github.com/docker/cli/pull/875)
-* Clarify description of volume prune command [docker/cli#867](https://github.com/docker/cli/pull/867)
-* Remove unused method from multireader package [moby/moby#36323](https://github.com/moby/moby/pull/36323)
-* Remove broken container check from image prune [moby/moby#36209](https://github.com/moby/moby/pull/36209)
-* Simplify codes on calculating shutdown timeout [moby/moby#34992](https://github.com/moby/moby/pull/34992)
-* Refactor Daemon.Commit() [moby/moby#36224](https://github.com/moby/moby/pull/36224)
-+ Add examples of prune by label [docker/cli#849](https://github.com/docker/cli/pull/849)
-+ Add quotes around format template [docker/cli#859](https://github.com/docker/cli/pull/859)
-+ Add unit tests to docker container ls [docker/cli#880](https://github.com/docker/cli/pull/880)
-+ Add unit tests to plugin create/remove/enable/disable commands [docker/cli#878](https://github.com/docker/cli/pull/878)
-* Create and send codecov report [moby/moby#34900](https://github.com/moby/moby/pull/34900)
-* Combine runSimpleContainer with runContainer for rename test [moby/moby#36223](https://github.com/moby/moby/pull/36223)
-* Rename integration/util to integration/internal [moby/moby#36265](https://github.com/moby/moby/pull/36265)
-* Move commit to container backend [moby/moby#36315](https://github.com/moby/moby/pull/36315)
-* Update gitignore [docker/cli#536](https://github.com/docker/cli/pull/536)
-* Vendor: update BurntSushi/toml for MIT license [moby/moby#36202](https://github.com/moby/moby/pull/36202)
-* Wrap response errors for container copy methods. [moby/moby#35979](https://github.com/moby/moby/pull/35979)
-* Ignore exist/not-exist errors on plugin remove [moby/moby#34372](https://github.com/moby/moby/pull/34372)
 
-### ---Triage---
-
-* Make sure we marshall version too… [docker/cli#891](https://github.com/docker/cli/pull/891)
-* Replace go-bindata with esc [docker/cli#874](https://github.com/docker/cli/pull/874)
-* Set a non-zero timeout for HTTP client communication with plugin backend. [docker/cli#883](https://github.com/docker/cli/pull/883)
-* Sync binary commits with vndr [moby/moby#36335](https://github.com/moby/moby/pull/36335)
-* Templated secrets and configs [moby/moby#33702](https://github.com/moby/moby/pull/33702)
-* Update go-swagger installation steps in Dockerfile [moby/moby#35749](https://github.com/moby/moby/pull/35749)
-* Use rslave propagation for mounts from daemon root [moby/moby#36055](https://github.com/moby/moby/pull/36055)
-* [client] Remove duplicate NewClient functions [moby/moby#34899](https://github.com/moby/moby/pull/34899)
-+ Add /proc/keys to masked paths [moby/moby#36368](https://github.com/moby/moby/pull/36368)
-+ Add DOCKER_TLS environment variable for --tls option [docker/cli#863](https://github.com/docker/cli/pull/863)
-+ Add Init API field documentation to swagger [moby/moby#34655](https://github.com/moby/moby/pull/34655)
-
-- ### Builder
+### Builder
 
 * switch to -buildmode=pie [moby/moby#34369](https://github.com/moby/moby/pull/34369)
 * Allow Dockerfile from outside build-context [docker/cli#886](https://github.com/docker/cli/pull/886)
@@ -121,8 +33,12 @@ be found.
 * Explain the columns shown in docker stats [docker/cli#860](https://github.com/docker/cli/pull/860)
 * GetAll -> Get to retrieve credentials from credential helpers [docker/cli#840](https://github.com/docker/cli/pull/840)
 + Add Engine version to docker node ls [docker/cli#885](https://github.com/docker/cli/pull/885)
-* Update event filter zsh completion with `disable`, `enable`, `install…` [docker/cli#372](https://github.com/docker/cli/pull/372)
+* Update event filter zsh completion with `disable`, `enable`, `install` and `remove` [docker/cli#372](https://github.com/docker/cli/pull/372)
 * Produce errors when empty ids are passed into inspect calls. [moby/moby#36144](https://github.com/moby/moby/pull/36144)
+* Marshall version [docker/cli#891](https://github.com/docker/cli/pull/891)
+* Replace go-bindata with esc [docker/cli#874](https://github.com/docker/cli/pull/874)
+* Set a non-zero timeout for HTTP client communication with plugin backend. [docker/cli#883](https://github.com/docker/cli/pull/883)
++ Add DOCKER_TLS environment variable for --tls option [docker/cli#863](https://github.com/docker/cli/pull/863)
 
 ### Logging
 
@@ -188,6 +104,9 @@ be found.
 * Graphdriver: Fix RefCounter memory leak [moby/moby#36256](https://github.com/moby/moby/pull/36256)
 * Use continuity fs package for volume copy [moby/moby#36290](https://github.com/moby/moby/pull/36290)
 * Use proc/exe for reexec [moby/moby#36124](https://github.com/moby/moby/pull/36124)
+* Templated secrets and configs [moby/moby#33702](https://github.com/moby/moby/pull/33702)
+* Use rslave propagation for mounts from daemon root [moby/moby#36055](https://github.com/moby/moby/pull/36055)
++ Add /proc/keys to masked paths [moby/moby#36368](https://github.com/moby/moby/pull/36368)
 
 ### Swarm Mode