diff --git a/metadata/service/control/container.yml b/metadata/service/control/container.yml
index c83ffb6..609a448 100644
--- a/metadata/service/control/container.yml
+++ b/metadata/service/control/container.yml
@@ -11,7 +11,7 @@
                 version: ${_param:opencontrail_version}
                 enabled: true
                 bind:
-                  address: $OPENCONTRAIL_CONTROL_LOCAL_HOST
+                  address: $LOCAL_IP
                 discovery:
                   host: ${_param:opencontrail_config_service_host}
                 name: $HOSTNAME
@@ -29,7 +29,7 @@
                 analytics:
                   host: ${_param:opencontrail_collector_service_host}
                 bind:
-                  address: $IP
+                  address: $LOCAL_IP
                 message_queue:
                   engine: rabbitmq
                   host: ${_param:rabbitmq_service_host}
@@ -53,7 +53,7 @@
                 version: ${_param:opencontrail_version}
                 enabled: true
                 bind:
-                  address: $IP
+                  address: $LOCAL_IP
                   port: 9081
                 discovery:
                   host: ${_param:opencontrail_config_service_host}
@@ -73,7 +73,7 @@
                 discovery:
                   host: ${_param:opencontrail_config_service_host}
                 bind:
-                  host: $IP
+                  host: $LOCAL_IP
                   port: 9042
                   rpc_port: 9160
                 id: $ID
@@ -107,4 +107,4 @@
                   engine: neutron
                   host: ${_param:neutron_service_host}
                 master:
-                  host: ${_param:opencontrail_config_service_host}
\ No newline at end of file
+                  host: ${_param:opencontrail_config_service_host}
diff --git a/opencontrail/files/3.0/basicauthusers.properties b/opencontrail/files/3.0/basicauthusers.properties
index 4aefe2d..33fb3ca 100644
--- a/opencontrail/files/3.0/basicauthusers.properties
+++ b/opencontrail/files/3.0/basicauthusers.properties
@@ -39,3 +39,9 @@
 #10.0.102.32.dns:10.0.102.32.dns
 #10.0.102.33:10.0.102.33
 #10.0.102.33.dns:10.0.102.33.dns
+{%- if config.ifmap is defined %}
+{%- for member in config.ifmap.members %}
+{{ member.user }}:{{ member.password }}
+{{ member.user }}.dns:{{ member.password }}.dns
+{%- endfor %}
+{%- endif %}