diff --git a/defaults/main.yml b/defaults/main.yml
index 383d545..5c12941 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -146,12 +146,15 @@ sahara_proxy_user_role_names: _member_
 
 # Other plugins can be added to the system by simply extending the list `sahara_plugin_base`.
 sahara_plugin_base:
-  - vanilla
-  - spark
-  - cdh
   - ambari
+  - cdh
+  - mapr
+  - spark
+  - storm
+  - vanilla
 
 sahara_plugin_loaded_base: "{% for plugin in sahara_plugin_base %}{{ plugin }}{% if not loop.last %},{% endif %}{% endfor %}"
+sahara_plugin_pip_packages: "{{ sahara_plugin_base | map('regex_replace', '^(.*)$', 'sahara-plugin-\\1') | list }}"
 
 ## Cap the maximum number of threads / workers when a user value is unspecified.
 sahara_api_workers_max: 16
diff --git a/doc/source/configure-sahara.rst b/doc/source/configure-sahara.rst
index 0809036..40d1f57 100644
--- a/doc/source/configure-sahara.rst
+++ b/doc/source/configure-sahara.rst
@@ -117,7 +117,7 @@ the NTP package is included in the image. The default NTP server will be
 Configuring plugins
 ~~~~~~~~~~~~~~~~~~~
 
-The following plugins are loaded by default:
+The following plugins are installed and loaded by default:
 
    .. code-block:: yaml
 
diff --git a/tasks/sahara_install.yml b/tasks/sahara_install.yml
index b03143c..104373a 100644
--- a/tasks/sahara_install.yml
+++ b/tasks/sahara_install.yml
@@ -41,7 +41,7 @@
     venv_install_destination_path: "{{ sahara_bin | dirname }}"
     venv_install_distro_package_list: "{{ sahara_distro_packages }}"
     venv_pip_install_args: "{{ sahara_pip_install_args }}"
-    venv_pip_packages: "{{ (sahara_oslomsg_amqp1_enabled | bool) | ternary(sahara_pip_packages + sahara_optional_oslomsg_amqp1_pip_packages, sahara_pip_packages) }}"
+    venv_pip_packages: "{{ (sahara_oslomsg_amqp1_enabled | bool) | ternary(sahara_pip_packages + sahara_plugin_pip_packages + sahara_optional_oslomsg_amqp1_pip_packages, sahara_pip_packages + sahara_plugin_pip_packages) }}"
     venv_facts_when_changed:
       - section: "sahara"
         option: "venv_tag"
diff --git a/tests/os_sahara-overrides.yml b/tests/os_sahara-overrides.yml
index 7d625bf..b7ee281 100644
--- a/tests/os_sahara-overrides.yml
+++ b/tests/os_sahara-overrides.yml
@@ -27,4 +27,7 @@ sahara_developer_mode: true
 sahara_service_password: "secrete"
 sahara_container_mysql_password: "SuperSecrete"
 sahara_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
+sahara_service_publicuri: "{{ sahara_service_proto }}://{{ hostvars[groups['sahara_api'][0]]['ansible_host'] }}:{{ sahara_service_port }}"
+sahara_service_internaluri: "{{ sahara_service_publicuri }}"
+sahara_service_adminuri: "{{ sahara_service_publicuri }}"
 sahara_wsgi_processes: 2