diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57e0e86204..103fcd018e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,16 +4,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-## [3.6.0-beta.3] - 2021-08-05
-### Fixed
-* The `flexberry-lookup` component in dropdown mode wrong calculate position.
-
-## [3.6.0-beta.2] - 2021-07-08
+## [3.6.0] - 2021-08-16
 ### Added
-- Changes from [`2.6.0`](#260---2021-06-16) and [`2.6.1`](#261---2021-07-02) versions.
+* Changes from [`2.6.0`](#260---2021-06-16) and [`2.6.1`](#261---2021-07-02) versions.
 
 ### Changed
-* Update dependency on `ember-flexberry-data` to version `3.6.0-beta.1`.
+* Update dependency on `ember-flexberry-data` to version `3.6.0`.
+* Add some improvements for UI of generated application.
+
+### Fixed
+* The `flexberry-lookup` component in dropdown mode wrong calculate position.
 
 ## [2.6.1] - 2021-07-02
 ### Fixed
@@ -74,17 +74,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
     * Removed mobile template.
     * An exception will be thrown when trying to use the block form of the component with `autocomplete` or `dropdown` options.
 
-## [3.6.0-beta.1] - 2021-04-29
-### Changed
-- Add some improvements for UI of generated application.
-
-## [3.6.0-beta.0] - 2020-10-07
-### Added
-- Changes from [`2.6.0-beta.0`](#260-beta0---2020-10-06) version.
-
-### Changed
-* Update dependency on `ember-flexberry-data` to version `3.6.0-beta.0`.
-
 ## [3.5.0] - 2020-09-17
 ### Added
 * Changes from [`2.5.0`](#250---2020-09-10) version.
diff --git a/bower.json b/bower.json
index fdbcb405e1..b3df432611 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-flexberry",
-  "version": "3.6.0-beta.3",
+  "version": "3.6.0",
   "dependencies": {
     "jquery-mockjax": "~2.2.1",
     "semantic-ui": "2.4.1",
diff --git a/package-lock.json b/package-lock.json
index 31302f5652..8f7c21638f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-flexberry",
-  "version": "3.6.0-beta.3",
+  "version": "3.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -10073,9 +10073,9 @@
       }
     },
     "ember-flexberry-data": {
-      "version": "3.6.0-beta.1",
-      "resolved": "https://registry.npmjs.org/ember-flexberry-data/-/ember-flexberry-data-3.6.0-beta.1.tgz",
-      "integrity": "sha512-4KbiFn3187qCamwmy24hGS5+EbKhQoIlTIifPn4fN93eobC5QYADblS5tIGzy/yjA1lLgZRfCHODihCS39pMFA==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/ember-flexberry-data/-/ember-flexberry-data-3.6.0.tgz",
+      "integrity": "sha512-Ml3CN2jsta7Lue2iehHIQT4re0/Yx53ocmZYxx0mEqYRrmRAra2T+Lzbb80ruoWUtJqIt1Id8ndDuo5mMird1Q==",
       "requires": {
         "ember-cli-babel": "^6.6.0",
         "ember-cli-htmlbars": "^2.0.1"
diff --git a/package.json b/package.json
index 5aa94a1cf4..d629785c22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-flexberry",
-  "version": "3.6.0-beta.3",
+  "version": "3.6.0",
   "description": "Ember Flexberry Addon",
   "keywords": [
     "ember-addon",
@@ -43,7 +43,7 @@
   "dependencies": {
     "ember-cli-babel": "^6.6.0",
     "ember-cli-htmlbars": "^2.0.1",
-    "ember-flexberry-data": "~3.6.0-beta.1",
+    "ember-flexberry-data": "~3.6.0",
     "ember-i18n": "5.2.1",
     "ember-i18n-cp-validations": "~3.1.0",
     "ember-test-selectors": "2.1.0",
diff --git a/vendor/ember-flexberry/register-version.js b/vendor/ember-flexberry/register-version.js
index 9559da3d34..435621b0f0 100644
--- a/vendor/ember-flexberry/register-version.js
+++ b/vendor/ember-flexberry/register-version.js
@@ -1,3 +1,3 @@
 /* globals Ember */
-var version = '3.6.0-beta.3';
+var version = '3.6.0';
 Ember.libraries.register('Ember Flexberry', version);