diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index 3078c273..d2a326d7 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -44,6 +44,18 @@ neutron_package_list: |-
   {% set _ = packages.extend(neutron_vpnaas_distro_packages) %}
   {% set _ = packages.extend(neutron_optional_vpnaas_distro_packages) %}
   {% endif %}
+  {% if neutron_services['neutron-server']['group'] in group_names %}
+  {%   set _ = packages.extend(neutron_server_distro_packages) %}
+  {% endif %}
+  {% if neutron_services['neutron-dhcp-agent']['group'] in group_names %}
+  {%   set _ = packages.extend(neutron_dhcp_agent_distro_packages) %}
+  {% endif %}
+  {% if neutron_services['neutron-l3-agent']['group'] in group_names %}
+  {%   set _ = packages.extend(neutron_l3_agent_distro_packages) %}
+  {% endif %}
+  {% if neutron_services['neutron-metering-agent']['group'] in group_names %}
+  {%   set _ = packages.extend(neutron_metering_agent_distro_packages) %}
+  {% endif %}
   {% if neutron_services['neutron-metadata-agent']['group'] in group_names %}
   {% set _ = packages.extend(neutron_metadata_agent_distro_packages) %}
   {% endif %}
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 2ceace2c..b940df3b 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -53,11 +53,17 @@ neutron_devel_distro_packages:
 neutron_service_distro_packages:
   - openstack-neutron
   - openstack-neutron-ml2
-  - openstack-neutron-macvtap-agent
-  - openstack-neutron-metering-agent
-  - openstack-neutron-l2gw-agent
   - python-memcached
 
+neutron_server_distro_packages: []
+
+neutron_dhcp_agent_distro_packages: []
+
+neutron_l3_agent_distro_packages: []
+
+neutron_metering_agent_distro_packages:
+  - openstack-neutron-metering-agent
+
 neutron_optional_ovs_distro_packages:
   - openstack-neutron-openvswitch
 
diff --git a/vars/suse.yml b/vars/suse.yml
index b6f1244a..cc5e5e35 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -68,13 +68,21 @@ neutron_devel_distro_packages:
 
 neutron_service_distro_packages:
   - openstack-neutron
-  - openstack-neutron-dhcp-agent
-  - openstack-neutron-l3-agent
   - openstack-neutron-metadata-agent
-  - openstack-neutron-metering-agent
-  - openstack-neutron-server
   - python-memcached
 
+neutron_server_distro_packages:
+  - openstack-neutron-server
+
+neutron_dhcp_agent_distro_packages:
+  - openstack-neutron-dhcp-agent
+
+neutron_l3_agent_distro_packages:
+  - openstack-neutron-l3-agent
+
+neutron_metering_agent_distro_packages:
+  - openstack-neutron-metering-agent
+
 neutron_optional_ovs_distro_packages:
   - openstack-neutron-openvswitch-agent
 
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml
index 0821eb1f..81af4cb7 100644
--- a/vars/ubuntu.yml
+++ b/vars/ubuntu.yml
@@ -64,16 +64,21 @@ neutron_devel_distro_packages:
   - python-httplib2
 
 neutron_service_distro_packages:
-  - neutron-server
-  - neutron-dhcp-agent
-  - neutron-l2gateway-agent
-  - neutron-l3-agent
-  - neutron-macvtap-agent
-  - neutron-metadata-agent
-  - neutron-metering-agent
   - neutron-plugin-ml2
   - python-memcache
 
+neutron_server_distro_packages:
+  - neutron-server
+
+neutron_dhcp_agent_distro_packages:
+  - neutron-dhcp-agent
+
+neutron_l3_agent_distro_packages:
+  - neutron-l3-agent
+
+neutron_metering_agent_distro_packages:
+  - neutron-metering-agent
+
 neutron_optional_ovs_distro_packages:
   - neutron-openvswitch-agent
 
@@ -102,6 +107,7 @@ neutron_vpnaas_distro_packages:
   - strongswan
 
 neutron_metadata_agent_distro_packages:
+  - neutron-metadata-agent
   - haproxy
 
 neutron_remove_distro_packages: