diff --git a/defaults/main.yml b/defaults/main.yml
index df4cd2ca..f827ec9d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -472,9 +472,9 @@ neutron_vpnaas_service_provider: VPN:strongswan:neutron_vpnaas.services.vpn.serv
 neutron_management_ip: 127.0.0.1
 
 # Calico Felix agent upstream settings
-calico_felix_url: "https://github.com/projectcalico/felix/releases/download/{{ calico_felix_version }}/calico-felix"
-calico_felix_version: 2.3.0
-calico_felix_sha256: 6cc538d6d93d2b5e732841769f427ce61a4e7d9a6eedf4ca8d33c4df42cf6419
+calico_felix_url: "https://github.com/projectcalico/felix/releases/download/{{ calico_felix_version }}/calico-felix-amd64"
+calico_felix_version: v3.5.2
+calico_felix_sha256: f7901c1b9e41c74c36b0ba2119c42c02ac6227af505f5bc571cee29e37b1550a
 calico_felix_validate_certs: yes
 
 # OVN Defaults
diff --git a/tasks/dependent_neutron_roles.yml b/tasks/dependent_neutron_roles.yml
index 27eb2938..0f48f588 100644
--- a/tasks/dependent_neutron_roles.yml
+++ b/tasks/dependent_neutron_roles.yml
@@ -25,7 +25,7 @@
   include_role:
     name: etcd
   vars:
-    etcd_install_type: proxy
+    etcd_install_type: gateway
   when:
     - "neutron_plugin_type in ['ml2.calico']"
     - "group_names | intersect([
diff --git a/templates/felix.cfg.j2 b/templates/felix.cfg.j2
index 8f5f8525..ed6ab302 100644
--- a/templates/felix.cfg.j2
+++ b/templates/felix.cfg.j2
@@ -2,3 +2,5 @@
 
 [global]
 MetadataAddr = {{ internal_lb_vip_address }}
+EtcdEndpoints = http://127.0.0.1:2379
+DatastoreType = etcdv3