diff --git a/defaults/main.yml b/defaults/main.yml
index 342fea56..02908f0f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -208,7 +208,6 @@ horizon_enable_designate_ui: False
 ## Neutron features to enable
 horizon_enable_neutron_lbaas: False
 horizon_enable_neutron_fwaas: False
-horizon_enable_neutron_vpnaas: False
 
 ## Swift
 horizon_swift_file_transfer_chunk_size: 524288
diff --git a/templates/horizon_local_settings.py.j2 b/templates/horizon_local_settings.py.j2
index 5f193b75..6d91f41f 100644
--- a/templates/horizon_local_settings.py.j2
+++ b/templates/horizon_local_settings.py.j2
@@ -282,8 +282,6 @@ OPENSTACK_NEUTRON_NETWORK = {
     'enable_distributed_router': False,
     'enable_lb': {{ horizon_enable_neutron_lbaas | bool }},
     'enable_ha_router': {{ horizon_enable_ha_router | bool }},
-    'enable_firewall': {{ horizon_enable_neutron_fwaas | bool }},
-    'enable_vpn': {{ horizon_enable_neutron_vpnaas | bool }},
     'enable_fip_topology_check': True,
 
     # Neutron can be configured with a default Subnet Pool to be used for IPv4