diff --git a/opencontrail/files/2.2/contrail-control.conf b/opencontrail/files/2.2/contrail-control.conf
index 6cd29ce..7992aea 100644
--- a/opencontrail/files/2.2/contrail-control.conf
+++ b/opencontrail/files/2.2/contrail-control.conf
@@ -29,10 +29,10 @@
 
 [IFMAP]
   certs_store=
-  password=control-node-1
+  password={{ control.bind.address }}
 # server_url= # Provided by discovery server, e.g. https://127.0.0.1:8443
 {%- if grains.get('virtual_subtype', None) == "Docker" %}
   server_url=https://{{ control.discovery.host }}:8443
 {%- endif %}
-  user=control-node-1
+  user={{ control.bind.address }}
 
diff --git a/opencontrail/files/3.0/contrail-control.conf b/opencontrail/files/3.0/contrail-control.conf
index ad2d046..b8241e4 100644
--- a/opencontrail/files/3.0/contrail-control.conf
+++ b/opencontrail/files/3.0/contrail-control.conf
@@ -29,9 +29,9 @@
 
 [IFMAP]
   certs_store=
-  password=control-node-1
+  password={{ control.bind.address }}
 # server_url= # Provided by discovery server, e.g. https://127.0.0.1:8443
 {%- if grains.get('virtual_subtype', None) == "Docker" %}
   server_url=https://{{ control.discovery.host }}:8443
 {%- endif %}
-  user=control-node-1
+  user={{ control.bind.address }}