diff --git a/roles/agent/templates/agent.conf.j2 b/roles/agent/templates/agent.conf.j2
index 80e7215..255b751 100644
--- a/roles/agent/templates/agent.conf.j2
+++ b/roles/agent/templates/agent.conf.j2
@@ -1,11 +1,11 @@
 [bluechi-agent]
 NodeName={{ agent_node_name | default(inventory_hostname) }}
 {%if agent_controller_address is defined %}
-ManagerAddress={{ agent_controller_address }}
+ControllerAddress={{ agent_controller_address }}
 {%endif%}
 {%if agent_controller_host is defined %}
-ManagerHost={{ agent_controller_host }}
+ControllerHost={{ agent_controller_host }}
 {%endif%}
 {%if agent_controller_port is defined %}
-ManagerPort={{ agent_controller_port }}
+ControllerPort={{ agent_controller_port }}
 {%endif%}