diff --git a/defaults/main.yml b/defaults/main.yml
index 82265de..532fdc9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -40,7 +40,7 @@ heat_git_repo: https://git.openstack.org/openstack/heat
 heat_git_install_branch: master
 heat_developer_mode: false
 heat_developer_constraints:
-  - "git+{{ heat_git_repo }}@{{ heat_git_install_branch }}#egg=heat"
+  - "git+{{ heat_git_repo }}@{{ heat_git_install_branch }}#egg=openstack-heat"
 
 # TODO(odyssey4me):
 # This can be simplified once all the roles are using
@@ -210,7 +210,7 @@ heat_plugin_dirs:
 # Common pip packages
 heat_pip_packages:
   - cryptography
-  - heat
+  - openstack-heat
   - keystonemiddleware
   - osprofiler
   - PyMySQL
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 125b77b..0949486 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -17,6 +17,7 @@ heat_distro_packages:
   - rsync
   - libxslt
   - which
+  - openmpi-devel
 
 heat_service_distro_packages:
   - openstack-heat-agents
diff --git a/vars/suse.yml b/vars/suse.yml
index b157153..139046a 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -17,6 +17,7 @@ heat_distro_packages:
   - rsync
   - libxslt
   - which
+  - openmpi-devel
 
 heat_service_distro_packages:
   - openstack-heat
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml
index 4d6fcf7..769ccc4 100644
--- a/vars/ubuntu.yml
+++ b/vars/ubuntu.yml
@@ -19,6 +19,7 @@ cache_timeout: 600
 heat_distro_packages:
   - rsync
   - libxslt1.1
+  - libopenmpi-dev
 
 heat_service_distro_packages:
   - heat-api