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