diff --git a/roles/defaults/vars/main.yml b/roles/defaults/vars/main.yml
index 45a3f08..2c48556 100644
--- a/roles/defaults/vars/main.yml
+++ b/roles/defaults/vars/main.yml
@@ -151,6 +151,7 @@
   neutron_netns_cleanup_cron: "registry.atmosphere.dev/library/neutron:{{ atmosphere_release }}"
   neutron_openvswitch_agent: "registry.atmosphere.dev/library/neutron:{{ atmosphere_release }}"
   neutron_ovn_metadata: "registry.atmosphere.dev/library/neutron:{{ atmosphere_release }}"
+  neutron_ovn_vpn: "registry.atmosphere.dev/library/neutron:{{ atmosphere_release }}"
   neutron_server: "registry.atmosphere.dev/library/neutron:{{ atmosphere_release }}"
   neutron_rpc_server: "registry.atmosphere.dev/library/neutron:{{ atmosphere_release }}"
   neutron_sriov_agent_init: "registry.atmosphere.dev/library/neutron:{{ atmosphere_release }}"
diff --git a/roles/neutron/vars/main.yml b/roles/neutron/vars/main.yml
index c4a78c3..db99e6e 100644
--- a/roles/neutron/vars/main.yml
+++ b/roles/neutron/vars/main.yml
@@ -32,6 +32,7 @@
         dhcp_agents_per_network: 3
         log_config_append: null
         rpc_workers: 8
+        rpc_response_timeout: 600
         service_plugins: qos,router,segments,trunk,vpnaas
         external_dns_driver: "{{ _neutron_external_dns_driver | default(omit) }}"
       cors:
@@ -87,12 +88,22 @@
   conf:
     neutron:
       DEFAULT:
-        service_plugins: qos,ovn-router,segments,trunk,log
+        service_plugins: qos,ovn-router,segments,trunk,log,ovn-vpnaas
       ovn:
         ovn_emit_need_to_frag: true
+      service_providers:
+        service_provider: VPN:strongswan:neutron_vpnaas.services.vpn.service_drivers.ovn_ipsec.IPsecOvnVPNDriver:default
     ovn_metadata_agent:
       DEFAULT:
         metadata_proxy_shared_secret: "{{ openstack_helm_endpoints['compute_metadata']['secret'] }}"
+    ovn_vpn_agent:
+      AGENT:
+        extensions: vpnaas
+      vpnagent:
+        vpn_device_driver: neutron_vpnaas.services.vpn.device_drivers.ovn_ipsec.OvnStrongSwanDriver
+    neutron_vpnaas:
+      service_providers:
+        service_provider: VPN:strongswan:neutron_vpnaas.services.vpn.service_drivers.ovn_ipsec.IPsecOvnVPNDriver:default
     plugins:
       ml2_conf:
         agent:
@@ -105,6 +116,7 @@
     daemonset_l3_agent: false
     daemonset_metadata_agent: false
     daemonset_ovn_metadata_agent: true
+    daemonset_ovn_vpn_agent: true
     daemonset_ovs_agent: false
     deployment_rpc_server: false
 
diff --git a/roles/tempest/vars/main.yml b/roles/tempest/vars/main.yml
index 39eb4245..ea508f9 100644
--- a/roles/tempest/vars/main.yml
+++ b/roles/tempest/vars/main.yml
@@ -190,3 +190,5 @@
             - tag
             - trunk
             - trunk-details
+            - vpnaas
+            - vpn-endpoint-groups