diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1bf9e98..e17f5fd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.2.0 - TBD
+## 2.2.0 - 2018-01-18
 
 ### Added
 
@@ -34,28 +34,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
-
-## 2.1.1 - TBD
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
 - [#289](https://github.com/zfcampus/zf-apigility-doctrine/pull/289) fixes
   configuration keys, which resolves issue with Apigility Admin and populating
   forms from config file and writing duplicated values into config file.
diff --git a/composer.json b/composer.json
index 679f2152..868b9c6f 100644
--- a/composer.json
+++ b/composer.json
@@ -22,8 +22,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1-dev",
-            "dev-develop": "2.2-dev"
+            "dev-master": "2.2-dev",
+            "dev-develop": "2.3-dev"
         },
         "zf": {
             "module": [
diff --git a/composer.lock b/composer.lock
index 8547b416..4909f5c9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "feefb5533f5c4656af546fad1e811219",
+    "content-hash": "818427e4d87860fdc1a2bb8afd69586a",
     "packages": [
         {
             "name": "api-skeletons/zf-doctrine-module-zend-hydrator",