diff --git a/defaults/main.yml b/defaults/main.yml
index 0dfe7dcb..dde11c74 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -346,6 +346,12 @@ neutron_octavia_request_poll_timeout: 100
 # neutron-server
 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_validate_certs: yes
+
 # Database specific configuration
 dragonflow_remote_db_ip: 127.0.0.1 # etcd has local proxy installed
 dragonflow_remote_db_port: 4001
diff --git a/vars/main.yml b/vars/main.yml
index c60b0c46..6ab22278 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -40,12 +40,8 @@ neutron_package_list: |-
   {% endif %}
   {{ packages }}
 
-# Set the Calico Felix agent URL information
-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
+# Set the Calico Felix agent executable destination path
 calico_felix_bin: /usr/local/bin/calico-felix
-calico_felix_validate_certs: yes
 
 ###
 ### Python code details