diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cd3856..5a771c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,110 @@
-# Changelog
+### Changelog
 
-## unreleased
+All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
-- Add vertical align
-- Recreate an empty placeholder block when deleting last block in a column
+Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-## 0.1.0
+#### [0.3.6](https://github.com/eea/volto-columns-block/compare/0.3.5...0.3.6)
 
-- Initial release
+- Prepare to release with release-it [`801ff41`](https://github.com/eea/volto-columns-block/commit/801ff4112653c386de33b65d2348101e625b830f)
+- Update .release-it [`58916be`](https://github.com/eea/volto-columns-block/commit/58916bebe9bf6a1e2209dc9a1c6e54619fa0f336)
+- Remove block toolbar z-index [`5e0da9c`](https://github.com/eea/volto-columns-block/commit/5e0da9c739fbf12c4b812e492593ea1dbc19e0f3)
+
+#### [0.3.5](https://github.com/eea/volto-columns-block/compare/0.3.4...0.3.5)
+
+> 22 October 2020
+
+- Optimize bundle (extract react-select into separate chunk) [`#8`](https://github.com/eea/volto-columns-block/pull/8)
+- Use react-select from separate chunk [`a8356a3`](https://github.com/eea/volto-columns-block/commit/a8356a330f226fe094d458db435fed24181d85ee)
+
+#### [0.3.4](https://github.com/eea/volto-columns-block/compare/0.3.3...0.3.4)
+
+> 20 October 2020
+
+- Separate react-color into its own chunk [`#7`](https://github.com/eea/volto-columns-block/pull/7)
+- Support copy in columnsBlock [`cdbc0c4`](https://github.com/eea/volto-columns-block/commit/cdbc0c4077b1369031b8e72f24b9a90fe9c099ff)
+
+#### [0.3.3](https://github.com/eea/volto-columns-block/compare/0.3.2...0.3.3)
+
+> 18 October 2020
+
+- Add BBB message [`0c54b74`](https://github.com/eea/volto-columns-block/commit/0c54b745979db06ecc6cabf76976548fd347faa5)
+
+#### [0.3.2](https://github.com/eea/volto-columns-block/compare/0.3.1...0.3.2)
+
+> 12 October 2020
+
+- Add layouts 20/80 and 80/20 [`#5`](https://github.com/eea/volto-columns-block/pull/5)
+- Solve: broken initial layout selection [`#4`](https://github.com/eea/volto-columns-block/pull/4)
+- Solve issue: drag handlers have min-height too big [`#6`](https://github.com/eea/volto-columns-block/pull/6)
+- Attempt (WIP) to solve the issue with a new widget [`9f633d6`](https://github.com/eea/volto-columns-block/commit/9f633d69ab0e5166f6af0c24ae7c92fbde4f8771)
+- Show icon for selected layout in Layout field [`96f6b00`](https://github.com/eea/volto-columns-block/commit/96f6b00e4172d52cd1421c48a718d885e8c58545)
+- Show icons in the Layout picker field [`b083c2b`](https://github.com/eea/volto-columns-block/commit/b083c2bf561baa93180930fe78c706dbd1370988)
+- Remove dup code, solve whitespace issue [`ed5dd18`](https://github.com/eea/volto-columns-block/commit/ed5dd182f6e4f8c23b86f7c15640e30fe4f1d29c)
+- Solve issue: Layout field is not automatically filled [`20603e3`](https://github.com/eea/volto-columns-block/commit/20603e313419ba00c626c9c738f3d95a618f14dd)
+- Solved issue: initial layout selection not applied [`add0c02`](https://github.com/eea/volto-columns-block/commit/add0c02cfed642d50747dcb40fb85ad5ea06d685)
+- Count columns from 1 instead of 0 [`904cb9c`](https://github.com/eea/volto-columns-block/commit/904cb9cbf3832a92762411e2709eb5e6ee431c3e)
+
+#### [0.3.1](https://github.com/eea/volto-columns-block/compare/0.3.0...0.3.1)
+
+> 10 October 2020
+
+- Working automatic replacement of last block in column [`0726bc7`](https://github.com/eea/volto-columns-block/commit/0726bc71269ea10b1d93a84b2bcd9c1f6658f814)
+- Improve modularization [`1bde90d`](https://github.com/eea/volto-columns-block/commit/1bde90d9d7e75618f412816855f169d82178df32)
+- Fix block chooser going under the sidebar; Add icon for full-width column layout [`1517b37`](https://github.com/eea/volto-columns-block/commit/1517b376fe9877f633a3908904896d8e84d25a48)
+- Simplify a bit [`243b415`](https://github.com/eea/volto-columns-block/commit/243b415df859705e20d0b58beacd88a2dc0d7358)
+- Add vertical align to columns [`4190788`](https://github.com/eea/volto-columns-block/commit/41907886f735b259f2903707b05efea8b135e9d4)
+- Adjust layout if columns change [`7fcc967`](https://github.com/eea/volto-columns-block/commit/7fcc967c5ff764fab8d6c4592f8162cd6af899e5)
+- Properly update the layout select widget according to choices [`c4a330f`](https://github.com/eea/volto-columns-block/commit/c4a330fe1ada456daf7b7e3d55a187b595380015)
+- Remove unused constant object [`69eaf73`](https://github.com/eea/volto-columns-block/commit/69eaf739e3f729ff5a2c08e4740cbdefb6b7e43e)
+- Delete button doesn't appear for the only block in column [`b905b92`](https://github.com/eea/volto-columns-block/commit/b905b9234a3e9ab8231f79405f5604bbb0b50e87)
+- Add changelog entry [`8b73c11`](https://github.com/eea/volto-columns-block/commit/8b73c11e86016e2e2795bdcfa34f7524eb318f61)
+- Move column block toolbar to left [`abf5158`](https://github.com/eea/volto-columns-block/commit/abf51587f19d83b41352156d83037c025c8b3598)
+
+#### [0.3.0](https://github.com/eea/volto-columns-block/compare/0.2.0...0.3.0)
+
+> 7 October 2020
+
+- Breaking: Rename coldata - data, columns - blocks, columns_layout - b… [`#2`](https://github.com/eea/volto-columns-block/pull/2)
+- Breaking: Rename coldata - data, columns - blocks, columns_layout - blocks_layout [`e5a47a5`](https://github.com/eea/volto-columns-block/commit/e5a47a5230ed0168f363b3eb6c0fec6d6379ca76)
+- Add support for metadata [`8267b27`](https://github.com/eea/volto-columns-block/commit/8267b271ff61fd0b1f6da4f106e3a1f1e552e76e)
+
+#### [0.2.0](https://github.com/eea/volto-columns-block/compare/0.1.0...0.2.0)
+
+> 7 October 2020
+
+- Refactor to work with @plone/volto#8.2.0 [`26bd6a5`](https://github.com/eea/volto-columns-block/commit/26bd6a5fddd3d21e94510b90fb87b01234a65e92)
+- Update docs [`c87710a`](https://github.com/eea/volto-columns-block/commit/c87710a1273de4baeccef183b07c9f77d5299de7)
+
+#### 0.1.0
+
+> 6 October 2020
+
+- WIP on columns [`361f74e`](https://github.com/eea/volto-columns-block/commit/361f74e22f29389fbf9280ef8ded84f5ff90e31a)
+- Add package content, extracted and improved from tiberiuichim/volto-blocks-form [`97413b2`](https://github.com/eea/volto-columns-block/commit/97413b2115b2227656fab7dc31d32a42c8ce5324)
+- Updates [`b3a5321`](https://github.com/eea/volto-columns-block/commit/b3a5321be5b70edabc03008ff3fc7bdb96bd3d9c)
+- Refactored for new volto-blocks-form API [`fa1e2f5`](https://github.com/eea/volto-columns-block/commit/fa1e2f5a127d167072e46657169cb76c9d5e05c9)
+- Style improvements [`7b3abba`](https://github.com/eea/volto-columns-block/commit/7b3abbaefa316796981ed27a35e8d9d23aa9af0f)
+- Add new layout svg icons, fix grid size, style improvements [`f9f2e2a`](https://github.com/eea/volto-columns-block/commit/f9f2e2a8f009ce4ba6714034b4db9f1d275e577a)
+- WIP on columns [`ecb50be`](https://github.com/eea/volto-columns-block/commit/ecb50be00b6bf3f583347c12c18b0fccb3d72f7c)
+- Initial commit [`3aa461b`](https://github.com/eea/volto-columns-block/commit/3aa461bf8204f9e16da4d27d34e1615a9c554cf9)
+- Rewrite ColumnsBlockEdit as class; solve slate block creation issue [`5d3726b`](https://github.com/eea/volto-columns-block/commit/5d3726bf8908cc25d2695d7c165e57a3bccf267e)
+- Updates [`470676f`](https://github.com/eea/volto-columns-block/commit/470676f01f6f783ef7442dbd04e7d083f9f07aa5)
+- WIP on columns [`17f52d1`](https://github.com/eea/volto-columns-block/commit/17f52d166aa33f0d491da04b7c38195f983f1292)
+- WIP on columns [`adbd733`](https://github.com/eea/volto-columns-block/commit/adbd7331acb38f674fbfe112c0fda628564030aa)
+- Sync from development [`c65d822`](https://github.com/eea/volto-columns-block/commit/c65d82288a0fd8acb6262aebd776f540ff39b5f5)
+- Improve columns layout [`8ee7a4e`](https://github.com/eea/volto-columns-block/commit/8ee7a4e48c478b464f893f3e2b609b525a0ce631)
+- Optimize icons [`911be87`](https://github.com/eea/volto-columns-block/commit/911be877769e3bfb240a9833cc46793ec6f87d8e)
+- Add layout field, WIP [`54057c7`](https://github.com/eea/volto-columns-block/commit/54057c72674c520370f6b840ed428cd786cff0ad)
+- Fix some styles [`284b9d5`](https://github.com/eea/volto-columns-block/commit/284b9d50363d6405d59b2c2a1799e2acb87de804)
+- Add story about blocksState [`c4fde42`](https://github.com/eea/volto-columns-block/commit/c4fde421580e2507534ba3265e78a2b939bfefef)
+- Fix package names, run bootstrap [`a44ed0f`](https://github.com/eea/volto-columns-block/commit/a44ed0ff5a7796db707f3a6c0233589f96738794)
+- Add schema for Column [`b65e4f7`](https://github.com/eea/volto-columns-block/commit/b65e4f71c4071eea263b8a389d2caab887fac552)
+- Add story about blocksState [`5685412`](https://github.com/eea/volto-columns-block/commit/5685412034643c2dcb5a4a3b7f26164c896653db)
+- Improve layout editing of column grid [`c5c1b96`](https://github.com/eea/volto-columns-block/commit/c5c1b9626ca454cf39d6c42a7fa47844fb28dfe2)
+- Improve readme, add screenshot [`c7cc001`](https://github.com/eea/volto-columns-block/commit/c7cc00105c1358a6647f262100f864fd846e3d2a)
+- Fix loading new column block [`0439073`](https://github.com/eea/volto-columns-block/commit/043907314db689f400eec4f9bad29eebe43268e9)
+- Use RenderBlocks component [`d57e2c1`](https://github.com/eea/volto-columns-block/commit/d57e2c1c3c84608af2bbd122cb14ce58b2f120fe)
+- Fix block selection issue [`b219c09`](https://github.com/eea/volto-columns-block/commit/b219c09f6f9b71bb096b84f49bcfe6002b3887b5)
+- Remove logging call [`461360b`](https://github.com/eea/volto-columns-block/commit/461360b32234b86ccc4411a51d0111a19fe26be8)
+- Remove unneeded class [`e009db9`](https://github.com/eea/volto-columns-block/commit/e009db97f6fc20a300ec9418123138f9d25e54eb)
diff --git a/package.json b/package.json
index 89f49ef..b67b212 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-columns-block",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "volto-columns-block: Volto add-on",
   "main": "src/index.js",
   "repository": "https://github.com/eea/volto-columns-block",