diff --git a/defaults/main.yml b/defaults/main.yml
index 4b4f3cab..77f3c93c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -57,7 +57,7 @@ neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas
 neutron_vpnaas_git_install_branch: master
 neutron_dynamic_routing_git_repo: https://opendev.org/openstack/neutron-dynamic-routing
 neutron_dynamic_routing_git_install_branch: master
-networking_calico_git_repo: https://opendev.org/openstack/networking-calico
+networking_calico_git_repo: https://github.com/projectcalico/networking-calico
 networking_calico_git_install_branch: master
 networking_odl_git_repo: https://opendev.org/openstack/networking-odl
 networking_odl_git_install_branch: master
diff --git a/vars/main.yml b/vars/main.yml
index 97e21d58..66b3f82a 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -51,6 +51,7 @@ neutron_optional_bgp_pip_packages:
 neutron_optional_calico_pip_packages:
   - networking-calico
   - python-etcd
+  - etcd3gw
 
 neutron_optional_vpnaas_pip_packages:
   - neutron_vpnaas
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index caff154e..64b44339 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -27,8 +27,7 @@
         - openstack-ansible-ovs-centos-8
         - openstack-ansible-ovn-ubuntu-bionic
         - openstack-ansible-ovn-centos-8
-        - openstack-ansible-deploy-aio_metal_calico-ubuntu-bionic:
-            voting: false
+        - openstack-ansible-deploy-aio_metal_calico-ubuntu-bionic
         - openstack-ansible-opendaylight-ubuntu-bionic
         - openstack-ansible-ovs-nsh-ubuntu-bionic
         - openstack-ansible-odl-sfc-ubuntu-bionic
@@ -41,8 +40,7 @@
         - openstack-ansible-ovs-ubuntu-bionic
         - openstack-ansible-ovs-centos-8
         - openstack-ansible-ovn-ubuntu-bionic
-        - openstack-ansible-deploy-aio_metal_calico-ubuntu-bionic:
-            voting: false
+        - openstack-ansible-deploy-aio_metal_calico-ubuntu-bionic
         - openstack-ansible-opendaylight-ubuntu-bionic
         - openstack-ansible-ovs-nsh-ubuntu-bionic
         - openstack-ansible-odl-sfc-ubuntu-bionic