diff --git a/Makefile b/Makefile
index 21d1beb..6e789b3 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,6 @@ include docker.mk
 
 BEHAT ?= "vendor/bin/behat"
 SITE ?= "default"
-# Update this with the base drush alias for your site.
-# Example, if your site's drush aliases are contained into mysite.site.yml
-# then the default site alias will be "mysite"
-DEFAULT_SITE_ALIAS ?= "sitename"
 FRONTEND_BASE_PATH = "/var/www/html/web/themes/custom"
 PROFILE ?= "minimal"
 ENVIRONMENT ?= "stg"
@@ -58,9 +54,9 @@ backstopjs-reference:
 backstopjs-test:
 	docker-compose exec backstopjs backstop test --filter='$(filter-out $@,$(MAKECMDGOALS))'
 
-## init-setup	:	Prepares the site
-.PHONY: init-setup
-init-setup:
+## setup-init	:	Prepares the site
+.PHONY: setup-init
+setup-init:
 	mkdir -p web/sites/default/files/behat/errors
 	chmod u+w web/sites/${SITE} -R
 	cp docker-compose.override.yml.dist docker-compose.override.yml
@@ -73,7 +69,7 @@ init-setup:
 ## setup	:	Prepares the site and installs it using the Drupal configuration files
 .PHONY: setup
 setup:
-	make init-setup
+	make setup-init
 	docker-compose exec -T php drush @${SITE}.local si ${PROFILE} --existing-config --sites-subdir=${SITE} -y
 	docker-compose exec -T php drush @${SITE}.local cim -y
 	docker-compose exec -T php drush @${SITE}.local cr
@@ -82,7 +78,7 @@ setup:
 ## setup-from-environment	:	Prepares the site and loads it with data from the reference site
 .PHONY: setup-from-environment
 setup-from-environment:
-	make init-setup
+	make setup-init
 	./scripts/reload-local.sh --site=${SITE} --env=${ENVIRONMENT}
 
 ## solr-sync	:	Reload docker Solr cores from local files.
diff --git a/drush/sites/sitename.site.yml.example b/drush/sites/sitename.site.yml.example
index 32857d5..50eb3a7 100644
--- a/drush/sites/sitename.site.yml.example
+++ b/drush/sites/sitename.site.yml.example
@@ -1,9 +1,5 @@
-docker:
+local:
   uri: 'http://example.docker.localhost:8000'
-  docker:
-      service: php
-      exec:
-        options: --user wodby
   root: '/var/www/html'
   user: 'wodby'
 
diff --git a/readme.md b/readme.md
index f625133..79dfa74 100644
--- a/readme.md
+++ b/readme.md
@@ -58,7 +58,18 @@ Once Composer finalizes the project creation an assistant will be automatically
 
 After the assistant finished, if you have selected to install Drupal your project will be running and the assistant will print the URL to access it.
 
+!!! NOTE
+    By default, drupal-boilerplate is installed with a minimal profile. If you want to install another profile, you must not install Drupal during the composer create-project installation problem, when the question 'Do you want to install Drupal?' appears. 
+    
+After that, just install the profile you need with the `drush site-install` command into the PHP container, after the project creation has finished.
 
+Example:
+
+```
+   drush site-install standard
+```
+
+Please note that if you install a profile that implements the hook_install the `make setup` command won't work as it makes a installation from configuration, and those installations requires the hook install to not be present.
 
 
 ## FAQ
diff --git a/tests/behat/features/content/article_access.feature b/tests/behat/features/content/article_access.feature.example
similarity index 100%
rename from tests/behat/features/content/article_access.feature
rename to tests/behat/features/content/article_access.feature.example
diff --git a/tests/behat/features/content/article_create.feature b/tests/behat/features/content/article_create.feature.example
similarity index 100%
rename from tests/behat/features/content/article_create.feature
rename to tests/behat/features/content/article_create.feature.example
diff --git a/tests/behat/features/content/article_delete.feature b/tests/behat/features/content/article_delete.feature.example
similarity index 100%
rename from tests/behat/features/content/article_delete.feature
rename to tests/behat/features/content/article_delete.feature.example
diff --git a/tests/behat/features/content/article_edit.feature b/tests/behat/features/content/article_edit.feature.example
similarity index 100%
rename from tests/behat/features/content/article_edit.feature
rename to tests/behat/features/content/article_edit.feature.example
diff --git a/tests/behat/features/content/article_view.feature b/tests/behat/features/content/article_view.feature.example
similarity index 100%
rename from tests/behat/features/content/article_view.feature
rename to tests/behat/features/content/article_view.feature.example
diff --git a/tests/behat/features/content/page_access.feature b/tests/behat/features/content/page_access.feature.example
similarity index 100%
rename from tests/behat/features/content/page_access.feature
rename to tests/behat/features/content/page_access.feature.example
diff --git a/tests/behat/features/content/page_create.feature b/tests/behat/features/content/page_create.feature.example
similarity index 100%
rename from tests/behat/features/content/page_create.feature
rename to tests/behat/features/content/page_create.feature.example
diff --git a/tests/behat/features/content/page_delete.feature b/tests/behat/features/content/page_delete.feature.example
similarity index 100%
rename from tests/behat/features/content/page_delete.feature
rename to tests/behat/features/content/page_delete.feature.example
diff --git a/tests/behat/features/content/page_edit.feature b/tests/behat/features/content/page_edit.feature.example
similarity index 100%
rename from tests/behat/features/content/page_edit.feature
rename to tests/behat/features/content/page_edit.feature.example
diff --git a/tests/behat/features/content/page_view.feature b/tests/behat/features/content/page_view.feature.example
similarity index 100%
rename from tests/behat/features/content/page_view.feature
rename to tests/behat/features/content/page_view.feature.example
diff --git a/web/sites/default/example.settings.local.php b/web/sites/default/example.settings.local.php
index 3468bc2..6d0fb6d 100644
--- a/web/sites/default/example.settings.local.php
+++ b/web/sites/default/example.settings.local.php
@@ -20,7 +20,6 @@
 }
 
 // Config splits.
-//$config['config_split.config_split.ci']['status'] = TRUE;
 $config['config_split.config_split.local']['status'] = TRUE;
 //$config['config_split.config_split.dev']['status'] = TRUE;
 //$config['config_split.config_split.stg']['status'] = TRUE;