diff --git a/neutron/upgrade/pkgs_latest.sls b/neutron/upgrade/pkgs_latest.sls
index f7d7723..afa31c0 100644
--- a/neutron/upgrade/pkgs_latest.sls
+++ b/neutron/upgrade/pkgs_latest.sls
@@ -33,7 +33,10 @@
     {%- do npkgs.append('python-vmware-nsx') %}
   {%- endif %}
   {% if server.get('bgp_vpn', {}).get('enabled', False) %}
-    {%- do npkgs.extend(server.pkgs_bagpipe) %}
+    {%- do npkgs.extend(server.pkgs_bgpvpn) %}
+    {% if server.bgp_vpn.driver == "bagpipe" %}
+      {%- do npkgs.extend(server.pkgs_bagpipe) %}
+    {%- endif %}
   {%- endif %}
   {% if server.get('l2gw', {}).get('enabled', False) %}
     {%- do npkgs.extend(server.pkgs_l2gw) %}
@@ -50,6 +53,9 @@
 {%- endif %}
 {%- if compute.enabled is defined and compute.enabled %}
   {%- do npkgs.extend(compute.pkgs) %}
+  {% if compute.get('bgp_vpn', {}).get('enabled', False) and compute.bgp_vpn.driver == "bagpipe" %}
+    {%- do npkgs.extend(compute.pkgs_bagpipe) %}
+  {%- endif %}
 {%- endif %}
 {%- if client.enabled is defined and client.enabled %}
   {%- do npkgs.extend(client.pkgs) %}
diff --git a/neutron/upgrade/service_running.sls b/neutron/upgrade/service_running.sls
index c1289ab..1be3502 100644
--- a/neutron/upgrade/service_running.sls
+++ b/neutron/upgrade/service_running.sls
@@ -29,6 +29,9 @@
   {% if compute.backend.sriov is defined %}
     {%- do nservices.append('neutron-sriov-agent') %}
   {%- endif %}
+  {% if compute.get('bgp_vpn', {}).get('enabled', False) and compute.bgp_vpn.driver == "bagpipe" %}
+    {%- do nservices.append('bagpipe-bgp') %}
+  {%- endif %}
 {%- endif %}
 
 {%- for nservice in nservices|unique %}
diff --git a/neutron/upgrade/service_stopped.sls b/neutron/upgrade/service_stopped.sls
index 5c0435e..1709382 100644
--- a/neutron/upgrade/service_stopped.sls
+++ b/neutron/upgrade/service_stopped.sls
@@ -29,6 +29,9 @@
   {% if compute.backend.sriov is defined %}
     {%- do nservices.append('neutron-sriov-agent') %}
   {%- endif %}
+  {% if compute.get('bgp_vpn', {}).get('enabled', False) and compute.bgp_vpn.driver == "bagpipe" %}
+    {%- do nservices.append('bagpipe-bgp') %}
+  {%- endif %}
 {%- endif %}