diff --git a/provisioning/ansible/config/profiles/beetbox.config.yml b/provisioning/ansible/config/profiles/beetbox.config.yml
index d4be9ba..8f3501c 100644
--- a/provisioning/ansible/config/profiles/beetbox.config.yml
+++ b/provisioning/ansible/config/profiles/beetbox.config.yml
@@ -73,14 +73,25 @@ mysql_users:
 
 # Extra utilities form provided roles.
 # Enabled by default.
+installed_extras_init: yes
 installed_extras_adminer: yes
+installed_extras_apache: yes
+installed_extras_apparmor: yes
+installed_extras_avahi: yes
+installed_extras_composer: yes
+installed_extras_drupal_console: yes
+installed_extras_drush: yes
+installed_extras_git: yes
 installed_extras_mailhog: yes
 installed_extras_memcached: yes
+installed_extras_mysql: yes
+installed_extras_nginx: yes
+installed_extras_pecl: yes
+installed_extras_php: yes
+installed_extras_upload_progress: yes
+installed_extras_web: yes
 installed_extras_xdebug: yes
 installed_extras_xhprof: yes
-installed_extras_drupal_console: yes
-installed_extras_drush: yes
-installed_extras_upload_progress: yes
 
 # Disabled by default.
 installed_extras_docker: no
diff --git a/provisioning/ansible/playbook-provision.yml b/provisioning/ansible/playbook-provision.yml
index 62c54eb..dba967f 100644
--- a/provisioning/ansible/playbook-provision.yml
+++ b/provisioning/ansible/playbook-provision.yml
@@ -20,67 +20,128 @@
         - "{{ beet_custom_pre_tasks }}"
 
   roles:
-    - beetbox-init
-    - { role: beetboxvm.known-hosts, when: "{{ known_hosts }}" }
-    - { role: geerlingguy.firewall, when: "{{ installed_extras_firewall }}" }
-    - geerlingguy.git
-    - geerlingguy.apache
-    - geerlingguy.apache-php-fpm
-    - geerlingguy.nginx
-    - geerlingguy.mysql
-    - beetbox-php-ppa
-    - { role: beetbox-php-7.0, when: "'{{ php_version }}' == '7.0'" }
-    - geerlingguy.php
-    - geerlingguy.php-pecl
-    - geerlingguy.php-mysql
-    - geerlingguy.composer
-    - pwelch.avahi
-    - { role: angstwad.docker_ubuntu, when: "{{ installed_extras_docker }}" }
-    - { role: thebinary.lxd, when: "{{ installed_extras_lxd }}" }
-    - { role: ANXS.postgresql, when: "{{ installed_extras_postgresql }}" }
-    - { role: geerlingguy.memcached, when: "{{ installed_extras_memcached }}" }
-    - { role: geerlingguy.php-memcached, when: "{{ installed_extras_memcached }}" }
-    - { role: geerlingguy.drush, when: "{{ installed_extras_drush }}" }
-    - { role: geerlingguy.drupal-console, when: "{{ installed_extras_drupal_console }}" }
-    - { role: thom8.php-upload-progress, when: "{{ installed_extras_upload_progress }}" }
-    - { role: geerlingguy.php-xdebug, when: "{{ installed_extras_xdebug }}" }
-    - { role: geerlingguy.php-xhprof, when: "{{ installed_extras_xhprof }}" }
-    - { role: geerlingguy.blackfire, when: "{{ installed_extras_blackfire }}" }
-    - { role: geerlingguy.adminer, when: "{{ installed_extras_adminer }}" }
-    - { role: geerlingguy.pimpmylog, when: "{{ installed_extras_pimpmylog }}" }
-    - { role: geerlingguy.daemonize, when: "{{ installed_extras_mailhog }}" }
-    - { role: geerlingguy.postfix, when: "{{ installed_extras_postfix }}" }
-    - { role: geerlingguy.mailhog, when: "{{ installed_extras_mailhog }}" }
-    - { role: franklinkim.newrelic, when: "{{ installed_extras_newrelic }}" }
-    - { role: geerlingguy.nodejs, when: "{{ installed_extras_nodejs }}" }
-    - { role: geerlingguy.redis, when: "{{ installed_extras_redis }}" }
-    - { role: geerlingguy.php-redis, when: "{{ installed_extras_redis }}" }
-    - { role: geerlingguy.ruby, when: "{{ installed_extras_ruby }}" }
-    - { role: rvm_io.rvm1-ruby, when: "{{ installed_extras_rvm }}" }
-    - { role: geerlingguy.java, when: "{{ installed_extras_solr }} or {{ installed_extras_selenium }} or {{ installed_extras_elasticsearch }}" }
-    - { role: geerlingguy.solr, when: "{{ installed_extras_solr }}" }
-    - { role: arknoll.selenium, when: "{{ installed_extras_selenium }}" }
-    - { role: geerlingguy.elasticsearch, when: "{{ installed_extras_elasticsearch }}" }
-    - { role: geerlingguy.varnish, when: "{{ installed_extras_varnish }}" }
-    - { role: hashbangcode.pantheon-cli, when: "{{ installed_extras_pantheon_cli }}" }
-    - { role: beetboxvm.phantomjs, when: "{{ installed_extras_phantomjs }}" }
-    - { role: heskethm.wp-cli, when: "{{ installed_extras_wp_cli }}" }
-    - { role: beetboxvm.drupal, when: beet_project == 'drupal' }
-    - { role: beetboxvm.backdrop, when: beet_project == 'backdrop' }
-    - { role: beetboxvm.cakephp, when: beet_project == 'cakephp' }
-    - { role: beetboxvm.concrete5, when: beet_project == 'concrete5' }
-    - { role: beetboxvm.kohana, when: beet_project == 'kohana' }
-    - { role: beetboxvm.modx, when: beet_project == 'modx' }
-    - { role: beetboxvm.silverstripe, when: beet_project == 'silverstripe' }
-    - { role: beetboxvm.slim, when: beet_project == 'slim' }
-    - { role: beetboxvm.symfony, when: beet_project == 'symfony' }
-    - { role: beetboxvm.wordpress, when: beet_project == 'wordpress' }
-    - { role: beetboxvm.packages }
-    - { role: beetbox-web }
-    - { role: beetbox-apparmor }
-    - { role: beetboxvm.symlinks, when: symlinks }
-    - { role: beetbox-php-nginx }
-    - { role: alexdesignworks.dcr, when: "{{ installed_extras_dcr }}" }
+    - role: beetbox-init
+      when: "{{ installed_extras_init }}"
+    - role: beetboxvm.known-hosts
+      when: "{{ known_hosts }}"
+    - role: geerlingguy.firewall
+      when: "{{ installed_extras_firewall }}"
+    - role: geerlingguy.git
+      when: "{{ installed_extras_git }}"
+    - role: geerlingguy.apache
+      when: "{{ installed_extras_apache }}"
+    - role: geerlingguy.apache-php-fpm
+      when: "{{ installed_extras_php }}"
+    - role: geerlingguy.nginx
+      when: "{{ installed_extras_nginx }}"
+    - role: geerlingguy.mysql
+      when: "{{ installed_extras_mysql }}"
+    - role: beetbox-php-ppa
+      when: "{{ installed_extras_php }}"
+    - role: beetbox-php-7.0
+      when: "'{{ installed_extras_php }}' and '{{ php_version }}' == '7.0'"
+    - role: geerlingguy.php
+      when: "{{ installed_extras_php }}"
+    - role: geerlingguy.php-pecl
+      when: "{{ installed_extras_pecl }}"
+    - role: geerlingguy.php-mysql
+      when: "{{ installed_extras_mysql }}"
+    - role: geerlingguy.composer
+      when: "{{ installed_extras_composer }}"
+    - role: pwelch.avahi
+      when: "{{ installed_extras_avahi }}"
+    - role: angstwad.docker_ubuntu
+      when: "{{ installed_extras_docker }}"
+    - role: thebinary.lxd
+      when: "{{ installed_extras_lxd }}"
+    - role: ANXS.postgresql
+      when: "{{ installed_extras_postgresql }}"
+    - role: geerlingguy.memcached
+      when: "{{ installed_extras_memcached }}"
+    - role: geerlingguy.php-memcached
+      when: "{{ installed_extras_memcached }}"
+    - role: geerlingguy.drush
+      when: "{{ installed_extras_drush }}"
+    - role: geerlingguy.drupal-console
+      when: "{{ installed_extras_drupal_console }}"
+    - role: thom8.php-upload-progress
+      when: "{{ installed_extras_upload_progress }}"
+    - role: geerlingguy.php-xdebug
+      when: "{{ installed_extras_xdebug }}"
+    - role: geerlingguy.php-xhprof
+      when: "{{ installed_extras_xhprof }}"
+    - role: geerlingguy.blackfire
+      when: "{{ installed_extras_blackfire }}"
+    - role: geerlingguy.adminer
+      when: "{{ installed_extras_adminer }}"
+    - role: geerlingguy.pimpmylog
+      when: "{{ installed_extras_pimpmylog }}"
+    - role: geerlingguy.daemonize
+      when: "{{ installed_extras_mailhog }}"
+    - role: geerlingguy.postfix
+      when: "{{ installed_extras_postfix }}"
+    - role: geerlingguy.mailhog
+      when: "{{ installed_extras_mailhog }}"
+    - role: franklinkim.newrelic
+      when: "{{ installed_extras_newrelic }}"
+    - role: geerlingguy.nodejs
+      when: "{{ installed_extras_nodejs }}"
+    - role: geerlingguy.redis
+      when: "{{ installed_extras_redis }}"
+    - role: geerlingguy.php-redis
+      when: "{{ installed_extras_redis }}"
+    - role: geerlingguy.ruby
+      when: "{{ installed_extras_ruby }}"
+    - role: rvm_io.rvm1-ruby
+      when: "{{ installed_extras_rvm }}"
+    - role: geerlingguy.java
+      when: "{{ installed_extras_solr }} or {{ installed_extras_selenium }} or {{ installed_extras_elasticsearch }}"
+    - role: geerlingguy.solr
+      when: "{{ installed_extras_solr }}"
+    - role: arknoll.selenium
+      when: "{{ installed_extras_selenium }}"
+    - role: geerlingguy.elasticsearch
+      when: "{{ installed_extras_elasticsearch }}"
+    - role: geerlingguy.varnish
+      when: "{{ installed_extras_varnish }}"
+    - role: hashbangcode.pantheon-cli
+      when: "{{ installed_extras_pantheon_cli }}"
+    - role: beetboxvm.phantomjs
+      when: "{{ installed_extras_phantomjs }}"
+    - role: heskethm.wp-cli
+      when: "{{ installed_extras_wp_cli }}"
+    - role: beetboxvm.drupal
+      when: "'{{ beet_project }}' == 'drupal'"
+    - role: beetboxvm.backdrop
+      when: "'{{ beet_project }}' == 'backdrop'"
+    - role: beetboxvm.cakephp
+      when: "'{{ beet_project }}' == 'cakephp'"
+    - role: beetboxvm.concrete5
+      when: "'{{ beet_project }}' == 'concrete5'"
+    - role: beetboxvm.kohana
+      when: "'{{ beet_project }}' == 'kohana'"
+    - role: beetboxvm.modx
+      when: "'{{ beet_project }}' == 'modx'"
+    - role: beetboxvm.silverstripe
+      when: "'{{ beet_project }}' == 'silverstripe'"
+    - role: beetboxvm.slim
+      when: "'{{ beet_project }}' == 'slim'"
+    - role: beetboxvm.symfony
+      when: "'{{ beet_project }}' == 'symfony'"
+    - role: beetboxvm.wordpress
+      when: "'{{ beet_project }}' == 'wordpress'"
+    - role: beetboxvm.packages
+      when: "{{ extra_packages }}"
+    - role: beetbox-web
+      when: "{{ installed_extras_web }}"
+    - role: beetbox-apparmor
+      when: "{{ installed_extras_apparmor }}"
+    - role: beetboxvm.symlinks
+      when: "{{ symlinks }}"
+    - role: beetbox-php-nginx
+      when: "{{ installed_extras_nginx }}"
+    - role: alexdesignworks.dcr
+      when: "{{ installed_extras_dcr }}"
 
   tasks: