diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2104ec4e1d1f9c1c855ec371179e75c9410ccd33..d69761470e6c490c49f15b1af2c3719675d4c014 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,16 +26,19 @@ For an example of how to require them in Drupal 8 site you can have a look at
* [varbase-project] template: Added composer-patches to repositories type vcs
for vardot/composer-patches repository
[#44](https://github.com/Vardot/varbase-project/issues/44)
- As it will fix issues of deleting some modules which they do
- have patches over them. it will work on composer require,
- composer update as we have fixed issues with
- [cweagans/composer-patches](https://github.com/cweagans/composer-patches/pull/243)
- and more. but they still not merged yet, we went on the way
- of managing our own
- [vardot/composer-patches](https://github.com/Vardot/composer-patches/commits/master)
- To follow with the latest work on this subject you could
- have a look at our Varbase Project template file:
- https://github.com/Vardot/varbase-project/blob/8.6.x/composer.json
+
+**NOTICE:** We're now using composer patches from Vardot repository to suggest
+several fixes and better handling of patches in your Drupal project.
+You'll notice that we have included (https://github.com/vardot/composer-patches)
+in the this composer.json repositories. This will replace the original
+library (cweagans/composer-patches) with our own from (vardot/composer-patches).
+See https://github.com/cweagans/composer-patches/pull/243 and more details
+on our changes on the composer-patches package. Once our changes get merged,
+we will revert to using (cweagans/composer-patches) without this override.
+
+To follow with the latest work on this subject you could
+have a look at our Varbase Project template file:
+https://github.com/Vardot/varbase-project/blob/8.6.x/composer.json
### Added since Varbase 8.6.2:
* Issue [#3021486](https://www.drupal.org/node/3021486):
diff --git a/README.md b/README.md
index 0c47e31589990f4876ac3d6e6f4d0c95e4067838..945c3879437b725251591bff469a3918dd5e0f52 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[](https://travis-ci.org/Vardot/varbase/builds/472062485) Varbase 8.6.3
+[](https://travis-ci.org/Vardot/varbase/builds/472332617) Varbase 8.6.3
[](https://www.drupal.org/project/varbase)
diff --git a/UPDATE.md b/UPDATE.md
index 1c1b58a99e07afd5c6c6393c62e4eb5d8f8db25d..dfc4948190dda1bb140a88d25f1e471f8bf5c828 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -110,7 +110,85 @@ while working on the project.
Then we will be ready to update the active config and database.
```
-## Varbase Procedures to update the varbase base code. not in any varbase-project project builders.
+## Varbase Procedures to update the varbase base code by varbase-project builder
+
+**NOTICE:** We're now using composer patches from Vardot repository to suggest
+several fixes and better handling of patches in your Drupal project.
+You'll notice that we have included (https://github.com/vardot/composer-patches)
+in this composer.json repositories. This will replace the original
+library (cweagans/composer-patches) with our own from (vardot/composer-patches).
+See https://github.com/cweagans/composer-patches/pull/243 and more details
+on our changes on the composer-patches package. Once our changes get merged,
+we will revert to using (cweagans/composer-patches) without this override.
+
+To follow with the latest work on this subject you could
+have a look at our Varbase Project template file:
+https://github.com/Vardot/varbase-project/blob/8.6.x/composer.json
+
+Add the following in **repositories** :
+```
+ "composer-patches": {
+ "type": "vcs",
+ "url": "https://github.com/vardot/composer-patches"
+}
+```
+
+Add the following in **extra** :
+```
+ "patchLevel": {
+ "drupal/core": "-p2"
+ }
+```
+
+In require change:
+```
+ "composer/installers": "^1.5.0",
+ "oomphinc/composer-installers-extender": "^1.1.2",
+ "cweagans/composer-patches": "^1.6.4",
+ "drupal-composer/drupal-scaffold": "^2.4.0",
+ "drupal/drupal-library-installer-plugin": "^0.3",
+ "webflo/drupal-finder": "^1.1.0",
+ "webmozart/path-util": "^2.3.0",
+ "vardot/varbase": "8.6.2",
+ "drupal/extlink": "1.x-dev#8a773a6c5519ccb167e18cc39d68551b30b0e4b3",
+ "drupal/image_resize_filter": "1.x-dev#c3f4b23b02005859092aaff746b9f21b794adc58",
+ "drupal/entity_clone": "1.x-dev#6d0ce053605e9aaf8412927a9b0ea8da7a9a06e5",
+ "drupal/tour_ui": "1.x-dev#5cf793c071aeddea0ecd20d80b541606bfe2aff1",
+ "drupal/tour_builder": "1.x-dev#d70e898949b7ec4095efb391a0dbec56d0117558",
+ "drupal/l10n_client": "1.x-dev#9bf8d597732870bdca301512c71b6e5d74d48db2",
+ "drupal/node_edit_protection": "1.x-dev#902339c08222f838030c07aaea23bdc51ababebd",
+ "drupal/security_review": "1.x-dev#35ebae445bb260e961e47c4c58efe7c50c228999",
+ "drupal/menu_position": "1.x-dev#d134276b4bbd08b3c9678943d0225fbef7dd05b5",
+ "drupal/mail_edit": "1.x-dev#bcd0041830d8581b36e6211f0c8eabd8caf9652b",
+ "drupal/taxonomy_menu": "3.x-dev#1103ad0855de4d242364a5b7e74a5c5fc1ce9e02",
+ "drupal/google_analytics_reports": "3.x-dev#2b6bb8efbc7f61ce3c1225638075aa6037b8db44",
+ "drupal/login_destination": "1.x-dev#54be8b89fdc073ca40af6b9b2eeb050e0aeb7908",
+ "drupal/betterlogin": "1.x-dev#f7cf1c5c9ec5e80c6ac0ef04ed605e25495232cd"
+```
+
+With:
+```
+ "composer/installers": "~1.0",
+ "oomphinc/composer-installers-extender": "~1.0",
+ "cweagans/composer-patches": "~1.0",
+ "drupal-composer/drupal-scaffold": "~2.0",
+ "drupal/drupal-library-installer-plugin": "^0.3",
+ "webflo/drupal-finder": "~1.0",
+ "webmozart/path-util": "~2.0",
+ "vardot/varbase": "~8.6.0",
+ "vardot/varbase-updater": "~1.0",
+ "drupal/image_resize_filter": "1.x-dev#c3f4b23b02005859092aaff746b9f21b794adc58",
+ "drupal/entity_clone": "1.x-dev#6d0ce053605e9aaf8412927a9b0ea8da7a9a06e5",
+ "drupal/tour_builder": "1.x-dev#d70e898949b7ec4095efb391a0dbec56d0117558",
+ "drupal/l10n_client": "1.x-dev#9bf8d597732870bdca301512c71b6e5d74d48db2",
+ "drupal/node_edit_protection": "1.x-dev#902339c08222f838030c07aaea23bdc51ababebd",
+ "drupal/security_review": "1.x-dev#35ebae445bb260e961e47c4c58efe7c50c228999",
+ "drupal/menu_position": "1.x-dev#d134276b4bbd08b3c9678943d0225fbef7dd05b5",
+ "drupal/mail_edit": "1.x-dev#bcd0041830d8581b36e6211f0c8eabd8caf9652b",
+ "drupal/google_analytics_reports": "3.x-dev#2b6bb8efbc7f61ce3c1225638075aa6037b8db44",
+ "drupal/login_destination": "1.x-dev#54be8b89fdc073ca40af6b9b2eeb050e0aeb7908"
+```
+
```
Given that we are at the root folder for varbase project, not the docroot
And we make sure that the current "Varbase-project" composer.json file and
diff --git a/drupal-org-core.make b/drupal-org-core.make
index 9d468dc5a8b3c06033f91bb36a6b2c63f766756d..b5fc61fbdbbd95cec646356f09e3aef2a3a5557e 100644
--- a/drupal-org-core.make
+++ b/drupal-org-core.make
@@ -3,7 +3,7 @@ core = 8.x
; Drupal Core
projects[drupal][type] = "core"
-projects[drupal][version] = "8.6.3"
+projects[drupal][version] = "8.6.4"
;; Issue #2869592: Disabled update module shouldn't produce a status report warning
projects[drupal][patch][] = https://www.drupal.org/files/issues/2869592-remove-update-warning-7.patch
;; Issue #2885441: EntityReferenceAutocompleteWidget should define its size setting as an integer
@@ -14,7 +14,7 @@ projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-09-24/28152
projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-10-23/1356276-549-8.6.x.patch
;; Issue #2914389: Allow profiles to exclude dependencies of their parent
projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-11-07/2914389-11-do-not-test.patch
-;; Issue #2720101: Label (Title) not set for Views block (exposed filters in Block)
+;; Issue #2720101 Label (Title) not set for Views block (exposed filters in Block)
projects[drupal][patch][] = https://www.drupal.org/files/issues/2720101-53.patch
;; Issue #2853988: Add option to rewrite robots.txt on staging environments
projects[drupal][patch][] = https://www.drupal.org/files/issues/drupal_8-allow_stg_robots-2853988-2.patch
diff --git a/drupal-org.make b/drupal-org.make
index 0c44efe67767f4f72b77c139067448edbe4a06a3..1b9c5aeae567a2fc9bda4f578afbd498c66ed496 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -63,9 +63,7 @@ projects[menu_block][type] = module
projects[menu_block][version] = 1.5
projects[extlink][type] = module
-projects[extlink][download][url] = https://git.drupal.org/project/extlink.git
-projects[extlink][download][revision] = 8a773a6c5519ccb167e18cc39d68551b30b0e4b3
-projects[extlink][download][branch] = 8.x-1.x
+projects[extlink][version] = 1.1
projects[linkit][type] = module
projects[linkit][version] = 4.3
@@ -175,9 +173,7 @@ projects[adminimal_admin_toolbar][type] = module
projects[adminimal_admin_toolbar][version] = 1.8
projects[tour_ui][type] = module
-projects[tour_ui][download][url] = https://git.drupal.org/project/tour_ui.git
-projects[tour_ui][download][revision] = 5cf793c071aeddea0ecd20d80b541606bfe2aff1
-projects[tour_ui][download][branch] = 8.x-1.x
+projects[tour_ui][version] = 1.0-beta2
projects[tour_builder][type] = module
projects[tour_builder][download][url] = https://git.drupal.org/project/tour_builder.git
@@ -318,9 +314,7 @@ projects[login_destination][download][branch] = 8.x-1.x
projects[login_destination][patch][] = https://www.drupal.org/files/issues/2018-03-09/toolbar_alter_error-2947616-11.patch
projects[betterlogin][type] = module
-projects[betterlogin][download][url] = https://git.drupal.org/project/betterlogin.git
-projects[betterlogin][download][revision] = f7cf1c5c9ec5e80c6ac0ef04ed605e25495232cd
-projects[betterlogin][download][branch] = 8.x-1.x
+projects[betterlogin][version] = 1.2
projects[social_api][type] = module
projects[social_api][version] = 2.0-beta4
@@ -491,7 +485,7 @@ projects[varbase_core][type] = module
projects[varbase_core][version] = 6.3
projects[varbase_media][type] = module
-projects[varbase_media][version] = 6.1
+projects[varbase_media][version] = 6.2
projects[varbase_bootstrap_paragraphs][type] = module
projects[varbase_bootstrap_paragraphs][version] = 6.2