diff --git a/vars/main.yml b/vars/main.yml
index 952997e1..a8aa4c76 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -444,8 +444,8 @@ neutron_services:
     start_order: 1
   calico-felix:
     group: neutron_calico_dhcp_agent
-    system_user: root
-    system_group: root
+    systemd_user_name: root
+    systemd_group_name: root
     service_name: calico-felix
     service_en: "{{ neutron_plugin_type == 'ml2.calico' }}"
     service_conf_path: /etc/calico
@@ -457,8 +457,8 @@ neutron_services:
     start_order: 3
   calico-dhcp-agent:
     group: neutron_calico_dhcp_agent
-    system_user: root
-    system_group: root
+    systemd_user_name: root
+    systemd_group_name: root
     service_name: calico-dhcp-agent
     service_en: "{{ neutron_plugin_type == 'ml2.calico' }}"
     service_rootwrap: rootwrap.d/dhcp.filters