diff --git a/README.md b/README.md
index de6daba8a5e366b386e27a087b27aed628cfa3e3..db26584c4839e968ce7087328186cfb1afacc2c2 100644
--- a/README.md
+++ b/README.md
@@ -20,30 +20,30 @@ in every project.
 * [Tested, tested, and tested.](https://travis-ci.org/Vardot/varbase/builds)
 
 Starting a new project? Consider Varbase for Drupal 8.
-Installing Varbase 8.x-4.x comes with several extra automated installation
+Installing Varbase 8.x-5.x comes with several extra automated installation
 steps, to take full advantage of Varbase, other than the Drupal 8 installation
 instructions.
 
 # Install with Composer
 
-To install the most recent stable release of Varbase 8.4.x run this command:
+To install the most recent stable release of Varbase 8.5.x run this command:
 ```
-composer create-project Vardot/varbase-project:^8.4.17 PROJECT_DIR_NAME --no-interaction
+composer create-project Vardot/varbase-project:^8.5.0-alpha1 PROJECT_DIR_NAME --no-interaction
 ```
 
-To install the dev version of Varbase 8.4.x run this command:
+To install the dev version of Varbase 8.5.x run this command:
 ```
-composer create-project vardot/varbase-project:8.4.x-dev PROJECT_DIR_NAME --stability dev --no-interaction
+composer create-project vardot/varbase-project:8.5.x-dev PROJECT_DIR_NAME --stability dev --no-interaction
 ```
 
-## [Create a new Vartheme sub theme for a project](https://github.com/Vardot/varbase/tree/8.x-4.x/scripts/README.md)
+## [Create a new Vartheme sub theme for a project](https://github.com/Vardot/varbase/tree/8.x-5.x/scripts/README.md)
 
-## [Automated Functional Testing](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/README.md)
+## [Automated Functional Testing](https://github.com/Vardot/varbase/blob/8.x-5.x/tests/README.md)
 
-## [Varbase Gherkin features](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/README.md)
+## [Varbase Gherkin features](https://github.com/Vardot/varbase/blob/8.x-5.x/tests/features/varbase/README.md)
 
-## [Varbase 8.4.x Developer Guide](https://docs.varbase.vardot.com)
+## [Varbase 8.5.x Developer Guide](https://docs.varbase.vardot.com)
 
-## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/8.x-4.x/CHANGELOG.md)
+## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/8.x-5.x/CHANGELOG.md)
 
-## [General instructions on how to update Varbase](https://github.com/Vardot/varbase/blob/8.x-4.x/UPDATE.md)
+## [General instructions on how to update Varbase](https://github.com/Vardot/varbase/blob/8.x-5.x/UPDATE.md)
diff --git a/UPDATE.md b/UPDATE.md
index 301a70f9192f7ad542b2269d5627391627335219..fb2ae0fd9ac430d833093f9201f6941420cd9e03 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -24,7 +24,7 @@ developers need to do to update the last release to the new release.
 * Backup your project files.
 * Test a restore for your backups, to make sure that your backups works.
 
-# 3 - Get the packaged files for the new version of Varbase 8.4.x
+# 3 - Get the packaged files for the new version of Varbase 8.5.x
 
 * From Drupal website: https://www.drupal.org/project/varbase
 * Using varbase-project: https://packagist.org/packages/vardot/varbase-project
@@ -558,12 +558,12 @@ Project template for Varbase distribution. as we had switch to create Varbase
  projects with the following clean composer command and files:
 
 https://github.com/Vardot/varbase-project
-https://github.com/Vardot/varbase-project/blob/8.4.x/composer.json
+https://github.com/Vardot/varbase-project/blob/8.5.x/composer.json
 
 Every Varbase script or command will be in vardot/varbase, bin/behat, marge-scripts.
 
 ```
-composer create-project vardot/varbase-project:8.4.x-dev PROJECT_DIR_NAME --stability dev --no-interaction
+composer create-project vardot/varbase-project:8.5.x-dev PROJECT_DIR_NAME --stability dev --no-interaction
 ```
 
 ### Moved all scripts:
@@ -572,22 +572,22 @@ Varbase Procedures to the varbase base code. not in any varbase-build or
  varbase-project project builders.
 
 ### Following the drupal/drupal composer.json
-https://github.com/drupal/drupal/blob/8.4.x/composer.json
+https://github.com/drupal/drupal/blob/8.5.x/composer.json
 
 Which will call and merge drupal/core composer.json
-https://github.com/drupal/core/blob/8.4.x/composer.json
+https://github.com/drupal/core/blob/8.5.x/composer.json
 This is the composer file for standard, and minimum drupal profiles.
 
 ### Varbase Project
 https://github.com/Vardot/varbase-project
 
 ### Varbase core
-https://github.com/Vardot/varbase/blob/8.x-4.x/README.md
+https://github.com/Vardot/varbase/blob/8.x-5.x/README.md
 
 ### Create new Vartheme sub theme for a project
-https://github.com/Vardot/varbase/blob/8.x-4.x/scripts/README.md
-https://github.com/Vardot/varbase/blob/8.x-4.x/scripts/scripts.settings.yml
-https://github.com/Vardot/varbase/blob/8.x-4.x/scripts/create-new-vartheme.sh
+https://github.com/Vardot/varbase/blob/8.x-5.x/scripts/README.md
+https://github.com/Vardot/varbase/blob/8.x-5.x/scripts/scripts.settings.yml
+https://github.com/Vardot/varbase/blob/8.x-5.x/scripts/create-new-vartheme.sh
 
 
 ```
@@ -642,12 +642,12 @@ Project template for Varbase distribution. as we had switch to create Varbase
  projects with the following clean composer command and files:
 
 https://github.com/Vardot/varbase-project
-https://github.com/Vardot/varbase-project/blob/8.4.x/composer.json
+https://github.com/Vardot/varbase-project/blob/8.5.x/composer.json
 
 Every Varbase script or command will be in vardot/varbase, bin/behat, marge-scripts.
 
 ```
-composer create-project vardot/varbase-project:8.4.x-dev PROJECT_DIR_NAME --stability dev --no-interaction
+composer create-project vardot/varbase-project:8.5.x-dev PROJECT_DIR_NAME --stability dev --no-interaction
 ```
 
 ### Moved all scripts:
@@ -656,22 +656,22 @@ Varbase Procedures to the varbase base code. not in any varbase-build or
  varbase-project project builders.
 
 ### Following the drupal/drupal composer.json
-https://github.com/drupal/drupal/blob/8.4.x/composer.json
+https://github.com/drupal/drupal/blob/8.5.x/composer.json
 
 Which will call and merge drupal/core composer.json
-https://github.com/drupal/core/blob/8.4.x/composer.json
+https://github.com/drupal/core/blob/8.5.x/composer.json
 This is the composer file for standard, and minimum drupal profiles.
 
 ### Varbase Project
 https://github.com/Vardot/varbase-project
 
 ### Varbase core
-https://github.com/Vardot/varbase/blob/8.x-4.x/README.md
+https://github.com/Vardot/varbase/blob/8.x-5.x/README.md
 
 ### Create new Vartheme sub theme for a project
-https://github.com/Vardot/varbase/blob/8.x-4.x/scripts/README.md
-https://github.com/Vardot/varbase/blob/8.x-4.x/scripts/scripts.settings.yml
-https://github.com/Vardot/varbase/blob/8.x-4.x/scripts/create-new-vartheme.sh
+https://github.com/Vardot/varbase/blob/8.x-5.x/scripts/README.md
+https://github.com/Vardot/varbase/blob/8.x-5.x/scripts/scripts.settings.yml
+https://github.com/Vardot/varbase/blob/8.x-5.x/scripts/create-new-vartheme.sh
 
 
 ```
diff --git a/build-varbase.make b/build-varbase.make
index feaef109afd49d798e1138a5dac651b1ea86f480..18ca41fdab36edf7ea88a64b0a0b87ca1800428c 100644
--- a/build-varbase.make
+++ b/build-varbase.make
@@ -4,4 +4,4 @@ includes[] = drupal-org-core.make
 
 projects[varbase][type] = profile
 projects[varbase][download][type] = git
-projects[varbase][download][branch] = 8.x-4.x
+projects[varbase][download][branch] = 8.x-5.x
diff --git a/composer.json b/composer.json
index a7f7bc3bac122b4558f565b70d5a654d267f78ef..ddf13d8f36417415bbf3029ece75b9f8af024156 100644
--- a/composer.json
+++ b/composer.json
@@ -214,7 +214,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-8.x-4.x": "8.4.x-dev"
+      "dev-8.x-5.x": "8.5.x-dev"
     },
     "installer-paths": {
       "docroot/core": ["drupal/core"],
diff --git a/modules/varbase_features/varbase_admin/varbase_admin.info.yml b/modules/varbase_features/varbase_admin/varbase_admin.info.yml
index 0472c806f533bbb9d6f38971cd48b06a0bfb6e75..80a56736483eec39cfc7c789bc19dd052759aa9e 100644
--- a/modules/varbase_features/varbase_admin/varbase_admin.info.yml
+++ b/modules/varbase_features/varbase_admin/varbase_admin.info.yml
@@ -19,6 +19,6 @@ dependencies:
   - views
   - views_bulk_edit
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-5.x-dev
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_core/varbase_core.info.yml b/modules/varbase_features/varbase_core/varbase_core.info.yml
index efbef7aa0a66ef19849b96416d4bcdc3b3732f85..d95fe708091d958dda308840ddb9caeaf6560444 100644
--- a/modules/varbase_features/varbase_core/varbase_core.info.yml
+++ b/modules/varbase_features/varbase_core/varbase_core.info.yml
@@ -16,6 +16,6 @@ dependencies:
   - node
   - taxonomy
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-5.x-dev
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_default_content/varbase_default_content.info.yml b/modules/varbase_features/varbase_default_content/varbase_default_content.info.yml
index 5e6bd93a2da8f2e38e2cd1286225667ac398a5bf..fee361c5842e657ec674d821e5a151e5c76a471b 100644
--- a/modules/varbase_features/varbase_default_content/varbase_default_content.info.yml
+++ b/modules/varbase_features/varbase_default_content/varbase_default_content.info.yml
@@ -5,6 +5,6 @@ description: 'Varbase default content'
 dependencies:
   - default_content
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-5.x-dev
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_development/varbase_development.info.yml b/modules/varbase_features/varbase_development/varbase_development.info.yml
index e77c664c744429c0334fca1311a0421960fe5617..cf2b0dd4caf719541defd147ba5db6185d5cfe6d 100644
--- a/modules/varbase_features/varbase_development/varbase_development.info.yml
+++ b/modules/varbase_features/varbase_development/varbase_development.info.yml
@@ -11,6 +11,6 @@ dependencies:
   - tour_ui
   - tour_builder
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-5.x-dev
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_internationalization/varbase_internationalization.info.yml b/modules/varbase_features/varbase_internationalization/varbase_internationalization.info.yml
index 1662d329f360efad6cebd7065cc7c992f1d39184..a2abd492d8c10ab1a0126706f16709f680ac0ef7 100644
--- a/modules/varbase_features/varbase_internationalization/varbase_internationalization.info.yml
+++ b/modules/varbase_features/varbase_internationalization/varbase_internationalization.info.yml
@@ -8,6 +8,6 @@ dependencies:
   - locale
   - l10n_client_ui
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-5.x-dev
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_landing/varbase_landing.info.yml b/modules/varbase_features/varbase_landing/varbase_landing.info.yml
index 384c10c2197d303802f4dd181fc1d83e5b5d04b0..b79a714ca98a715248f568e1eeea63bc500e0537 100755
--- a/modules/varbase_features/varbase_landing/varbase_landing.info.yml
+++ b/modules/varbase_features/varbase_landing/varbase_landing.info.yml
@@ -26,6 +26,6 @@ dependencies:
   - viewsreference
   - yoast_seo
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-5.x-dev
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_media/varbase_media.info.yml b/modules/varbase_features/varbase_media/varbase_media.info.yml
index c3aa88f534780011cc01fff2df97c1b449b167e2..d8d336ca0ecdf9cf46e777f596c7ea5dbc52bea7 100644
--- a/modules/varbase_features/varbase_media/varbase_media.info.yml
+++ b/modules/varbase_features/varbase_media/varbase_media.info.yml
@@ -30,6 +30,6 @@ dependencies:
   - video_embed_media
   - views
   - views_infinite_scroll
-version: 8.x-4.x-dev
+version: 8.x-5.x-dev
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_page/varbase_page.info.yml b/modules/varbase_features/varbase_page/varbase_page.info.yml
index e653557360de327e5395145cb4c8a6a128e27b6b..e4b8d5dd88a056bf3cd6eaf25b9ea4db39161368 100644
--- a/modules/varbase_features/varbase_page/varbase_page.info.yml
+++ b/modules/varbase_features/varbase_page/varbase_page.info.yml
@@ -20,6 +20,6 @@ dependencies:
   - varbase_seo
   - yoast_seo
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-5.x-dev
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_search/varbase_search.info.yml b/modules/varbase_features/varbase_search/varbase_search.info.yml
index f01e359be10f267a5bfd56357f2a474b1d39cb20..b4809761ac40177d43fcddef87cedb1d96d06321 100644
--- a/modules/varbase_features/varbase_search/varbase_search.info.yml
+++ b/modules/varbase_features/varbase_search/varbase_search.info.yml
@@ -2,7 +2,7 @@ name: 'Varbase Search'
 description: 'Provides search configuration, and offering search capabilities.'
 type: module
 core: 8.x
-version: 8.x-4.x-dev
+version: 8.x-5.x-dev
 package: Varbase
 dependencies:
   - better_exposed_filters
diff --git a/modules/varbase_features/varbase_security/varbase_security.info.yml b/modules/varbase_features/varbase_security/varbase_security.info.yml
index 4d9c1b57e14f4168065a27b77c660689983f0f49..d45afa30e4d8fa36834f21f701469701fbb294e7 100644
--- a/modules/varbase_features/varbase_security/varbase_security.info.yml
+++ b/modules/varbase_features/varbase_security/varbase_security.info.yml
@@ -17,6 +17,6 @@ dependencies:
   - user
   - username_enumeration_prevention
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-5.x-dev
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_seo/varbase_seo.info.yml b/modules/varbase_features/varbase_seo/varbase_seo.info.yml
index 7e0dce26a601176c5f4429df9b07f640db53ee0e..9de2b19a45f1b64a5f23a9e420e5cad63d79e9eb 100644
--- a/modules/varbase_features/varbase_seo/varbase_seo.info.yml
+++ b/modules/varbase_features/varbase_seo/varbase_seo.info.yml
@@ -26,6 +26,6 @@ dependencies:
   - user
   - yoast_seo
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-5.x-dev
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_tour/varbase_tour.info.yml b/modules/varbase_features/varbase_tour/varbase_tour.info.yml
index 4a9334ef98efe36ac97ed2e2aa3b0f3ba0c7a31e..492d3611773e9de3987c0c7bf0b7f8cedff82b62 100644
--- a/modules/varbase_features/varbase_tour/varbase_tour.info.yml
+++ b/modules/varbase_features/varbase_tour/varbase_tour.info.yml
@@ -4,6 +4,6 @@ type: module
 dependencies:
   - tour
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-5.x-dev
 core: 8.x
 project: varbase
diff --git a/modules/varbase_features/varbase_webform/varbase_webform.info.yml b/modules/varbase_features/varbase_webform/varbase_webform.info.yml
index 7f528bc6be679a91c0c5ccb8f8adaaeb3f9a8663..c38120bd83faae6f3e0b43a098a1178d02e1e1b5 100644
--- a/modules/varbase_features/varbase_webform/varbase_webform.info.yml
+++ b/modules/varbase_features/varbase_webform/varbase_webform.info.yml
@@ -9,6 +9,6 @@ dependencies:
   - webform_ui
   - webform_bootstrap
 package: Varbase
-version: 8.x-4.x-dev
+version: 8.x-5.x-dev
 core: 8.x
 project: varbase
diff --git a/tests/README.md b/tests/README.md
index 1e19853214d72e1d523a60d3776011ff53184ec0..47ac2fd14c36bdbbe5cbf9590bb9ea76b77bdc42 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -8,13 +8,13 @@
  This page can help  you to have the list all steps, which you need to run the
  Behat Gherkin Features to test a varbase website in your localhost machine.
 
-To test varbase 8.x-4.x in the right way you will need to build varbase using
+To test varbase 8.x-5.x in the right way you will need to build varbase using
 the composer.
 
 ## Create a Varbase project with [Composer](https://getcomposer.org/download/):
 
 ```
-composer create-project vardot/varbase:8.4.x-dev PROJECT_DIR_NAME --stability dev --no-interaction
+composer create-project vardot/varbase:8.5.x-dev PROJECT_DIR_NAME --stability dev --no-interaction
 ```
 
 --------------------------------------------------------------------------------
diff --git a/tests/features/varbase/README.md b/tests/features/varbase/README.md
index 740913d7334f5464e7a279bd7d231988fb86f419..35d54430cb2d0cf77fcc2be053aee7769eda569d 100644
--- a/tests/features/varbase/README.md
+++ b/tests/features/varbase/README.md
@@ -1,6 +1,6 @@
 # Varbase Gherkin features
 
-A list of features, and scenarios to have a full test over Varbase 8.x-4.x
+A list of features, and scenarios to have a full test over Varbase 8.x-5.x
 
 If you want to run all Gherkin Features over a new Varbase site.
 You will need to create the list of Testing users, Arabic
diff --git a/tests/tools/install-varbase/arabic-installation.feature b/tests/tools/install-varbase/arabic-installation.feature
index 6f087a4891f4f8c95c490a12d9b1bca019d532dc..4c72a7f3cf79b821bfe8e8899356b2a33e91a0f5 100644
--- a/tests/tools/install-varbase/arabic-installation.feature
+++ b/tests/tools/install-varbase/arabic-installation.feature
@@ -4,7 +4,7 @@ I want to be able to install Varbase for a selected client
 So that I will be able to initiate the site with the default installation
 
   @javascript @tools @install @local @development
-  Scenario: Arabic installation for Varbase 8.x-4.x
+  Scenario: Arabic installation for Varbase 8.x-5.x
     Given I go to "/core/install.php"
       And I wait
      Then I should see "Choose language"
diff --git a/tests/tools/install-varbase/default-installation.feature b/tests/tools/install-varbase/default-installation.feature
index b369df2a2147521923e1fa86e927615eb10b66c7..c2d28f9d06f7e2ce80c47422434c459355407f25 100644
--- a/tests/tools/install-varbase/default-installation.feature
+++ b/tests/tools/install-varbase/default-installation.feature
@@ -4,7 +4,7 @@ I want to be able to install Varbase for a selected client
 So that I will be able to initiate the site with the default installation
 
   @javascript @tools @install @local @development
-  Scenario: Default installation for Varbase 8.x-4.x
+  Scenario: Default installation for Varbase 8.x-5.x
     Given I go to "/core/install.php"
       And I wait
      Then I should see "Choose language"
diff --git a/tests/tools/install-varbase/english-language-installation.feature b/tests/tools/install-varbase/english-language-installation.feature
index 32c2b69d546ed4031b34df1de51aa4bab9fc0a5a..f964261061227eda1c2bee439f81452001a10c53 100644
--- a/tests/tools/install-varbase/english-language-installation.feature
+++ b/tests/tools/install-varbase/english-language-installation.feature
@@ -4,7 +4,7 @@ I want to be able to install Varbase for a selected client
 So that I will be able to initiate the site with the default installation
 
   @javascript @tools @install @local @development
-  Scenario: English installation for Varbase 8.x-4.x
+  Scenario: English installation for Varbase 8.x-5.x
     Given I go to "/core/install.php"
       And I wait
      Then I should see "Choose language"
diff --git a/tests/tools/install-varbase/multilingual-installation.feature b/tests/tools/install-varbase/multilingual-installation.feature
index 12305b2980b2956c0a70ee5a8914cd5505851ce5..54ed34cf113529efc9d40b352ef086e76cfc4fac 100644
--- a/tests/tools/install-varbase/multilingual-installation.feature
+++ b/tests/tools/install-varbase/multilingual-installation.feature
@@ -4,7 +4,7 @@ I want to be able to install Varbase for a selected client
 So that I will be able to initiate the site with the default installation
 
   @javascript @tools @install @local @development
-  Scenario: Multilingual installation for Varbase 8.x-4.x
+  Scenario: Multilingual installation for Varbase 8.x-5.x
     Given I go to "/core/install.php"
       And I wait
      Then I should see "Choose language"
diff --git a/varbase.info.yml b/varbase.info.yml
index c17e2c76e72e3519a02e762178d8fb9c8398b7dc..3284503e66ce7c412cfe0dba6b21315f4de25e81 100755
--- a/varbase.info.yml
+++ b/varbase.info.yml
@@ -6,7 +6,7 @@ distribution:
   name: Varbase
   install:
     theme: vartheme_admin
-version: 8.x-4.x-dev
+version: 8.x-5.x-dev
 dependencies:
   # core
   - automated_cron