diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index 2f577306..ace5dd12 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -36,7 +36,7 @@ neutron_package_list: |-
   {% set _ = packages.extend(neutron_lxb_distro_packages) %}
   {% set _ = packages.extend(neutron_optional_lxb_distro_packages) %}
   {% endif %}
-  {% if neutron_services['neutron-vpnaas-agent']['group'] in group_names and neutron_vpnaas | bool %}
+  {% if neutron_services['neutron-l3-agent']['group'] in group_names and neutron_vpnaas | bool %}
   {% set _ = packages.extend(neutron_vpnaas_distro_packages) %}
   {% set _ = packages.extend(neutron_optional_vpnaas_distro_packages) %}
   {% endif %}
diff --git a/vars/main.yml b/vars/main.yml
index b41165ce..e9e1931d 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -444,22 +444,6 @@ neutron_services:
     config_type: "ini"
     init_config_overrides: "{{ neutron_bgp_dragent_init_overrides }}"
     start_order: 3
-  # TODO(mnaser): neutron-vpnaas-agent binary was dropped in Queens
-  #               and replaced by a plugin to neutron-l3-agent.  We missed
-  #               this in Queens, so let's remove this in T to disable
-  #               the service.
-  neutron-vpnaas-agent:
-    group: neutron_l3_agent
-    service_name: neutron-vpn-agent
-    service_en: false
-    service_conf_path: "{{ neutron_conf_version_dir }}"
-    service_conf: vpnaas_agent.ini
-    service_rootwrap: rootwrap.d/vpnaas.filters
-    execstarts: "{{ neutron_bin }}/neutron-vpn-agent --config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/vpnaas_agent.ini"
-    config_overrides: "{{ neutron_vpnaas_agent_ini_overrides }}"
-    config_type: "ini"
-    init_config_overrides: "{{ neutron_vpn_agent_init_overrides }}"
-    start_order: 3
   neutron-server:
     group: neutron_server
     service_name: neutron-server
diff --git a/vars/source_install.yml b/vars/source_install.yml
index de77e5cf..819286cb 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -34,7 +34,7 @@ neutron_package_list: |-
   {% if neutron_services['neutron-linuxbridge-agent']['group'] in group_names and neutron_services['neutron-linuxbridge-agent'].service_en | bool %}
   {% set _ = packages.extend(neutron_lxb_distro_packages) %}
   {% endif %}
-  {% if neutron_services['neutron-vpnaas-agent']['group'] in group_names and neutron_vpnaas | bool %}
+  {% if neutron_services['neutron-l3-agent']['group'] in group_names and neutron_vpnaas | bool %}
   {% set _ = packages.extend(neutron_vpnaas_distro_packages) %}
   {% endif %}
   {% if neutron_services['neutron-metadata-agent']['group'] in group_names %}