diff --git a/defaults/main.yml b/defaults/main.yml
index 33d62374..cd964a11 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -349,6 +349,15 @@ nova_metadata_insecure: False
 # Service (Optional)" for more details.
 neutron_octavia_request_poll_timeout: 100
 
+###
+### VPNaaS Configuration
+###
+
+# See VPNaaS documentation for driver/service provider selection
+# in case you want to override it.
+neutron_driver_vpnaas: neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
+neutron_vpnaas_service_provider: VPN:strongswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
+
 ###
 ### Dragonflow Configuration
 ###
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index 360ff2a5..4c7d6bfd 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -21,9 +21,6 @@ neutron_ovs_distro_packages:
 
 neutron_ovs_service_name: openvswitch-switch
 
-neutron_driver_vpnaas: neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
-neutron_vpnaas_service_provider: VPN:strongswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
-
 ## APT Cache options
 cache_timeout: 600