diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8c4ca9b8..fe6bd9822 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,38 @@
 Magento Functional Testing Framework Changelog
 ================================================
+
+2.6.0
+-----
+
+* Traceability
+    * MFTF generated cest files are fully compatible for Codeception `dry-run`.
+* Modularity
+    * `mftf generate:tests` and `mftf run:test` commands now accept suite scoped test names in format `[suitename:testname]...`.
+* Maintainability
+    * Support `deprecated` syntax for the following test entities:
+        * Test
+        * Action Group
+        * Data
+        * Metadata
+        * Page
+        * Section
+        * Section Element
+            * See DevDocs for details 
+    * Improved `mftf static-checks` command to allow executing all or specific static checks.
+    * Added a new static check that checks and reports unused arguments in action groups.
+* Customizability
+    * AWS Secrets Manager has been added as an additional credential storage.
+        * See DevDocs for details
+
+### Fixes
+* Fixed missing before, after, failed steps in cest file when generating tests with `--allow-skipped` option.
+* Fixed suites and tests display issue in Allure `Suites` page after `mftf run:group` command.
+* `createData` action now shows a meaningful error message at runtime when the entity does not exist.
+
+### GitHub Issues/Pull requests:
+* [#537](https://github.com/magento/magento2-functional-testing-framework/pull/537) -- Refactor of TestGenerator class
+* [#538](https://github.com/magento/magento2-functional-testing-framework/pull/538) -- FEATURE: <magentoCron> command to execute Cron Jobs
+
 2.5.4
 -----
 [Demo Video](https://www.youtube.com/watch?v=tguvkw1HWKg)
diff --git a/composer.json b/composer.json
index ca1c02572..e6d081114 100755
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "2.5.4",
+    "version": "2.6.0",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {
diff --git a/composer.lock b/composer.lock
index 6bfc30ab9..051ab6441 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2325a3a38edb33b24f6e33bd3009fd8a",
+    "content-hash": "859ddf6506836faaabb056ae7b377c63",
     "packages": [
         {
             "name": "allure-framework/allure-codeception",
@@ -1710,6 +1710,7 @@
                 "selenium",
                 "webdriver"
             ],
+            "abandoned": "php-webdriver/webdriver",
             "time": "2018-05-16T17:37:13+00:00"
         },
         {