diff --git a/playbooks/roles/install_contrail/tasks/create_vcenter_manager.yml b/playbooks/roles/install_contrail/tasks/create_vcenter_manager.yml
index e6b0d5ed..23a08286 100644
--- a/playbooks/roles/install_contrail/tasks/create_vcenter_manager.yml
+++ b/playbooks/roles/install_contrail/tasks/create_vcenter_manager.yml
@@ -5,37 +5,6 @@
     state: directory
     recurse: yes
 
-- name: set vcenter url if defined
-  set_fact:
-    vcenter_server: "{{ contrail_configuration.VCENTER_SERVER }}"
-  when: contrail_configuration.VCENTER_SERVER is defined
-
-- name: set vcenter port if defined
-  set_fact:
-    vcenter_server: "{{ contrail_configuration.VCENTER_SERVER }}"
-  when: contrail_configuration.VCENTER_PORT is defined
-
-- name: set vcenter username if defined
-  set_fact:
-    vcenter_username: "{{ contrail_configuration.VCENTER_USERNAME }}"
-  when: contrail_configuration.VCENTER_USERNAME is defined
-
-- name: set vcenter password if defined
-  set_fact:
-    vcenter_password: "{{ contrail_configuration.VCENTER_PASSWORD }}"
-  when: contrail_configuration.VCENTER_PASSWORD is defined
-
-- name: set vcenter datacenter if defined
-  set_fact:
-    vcenter_datacenter: "{{ contrail_configuration.VCENTER_DATACENTER }}"
-  when: contrail_configuration.VCENTER_DATACENTER is defined
-
-- name: set esxi datacenter if defined
-  set_fact:
-    vcenter_datacenter: "{{ contrail_configuration.VCENTER_DATACENTER }}"
-  when: contrail_configuration.ESXI is defined
-
-
 - name: "get /etc/contrail/common_vcmanager.env stat"
   stat:
     path: "/etc/contrail/common_vcmanager.env"
@@ -59,11 +28,16 @@
 
 - name: "populate pod specific common_vcmanager.env"
   lineinfile: dest=/etc/contrail/common_vcmanager.env regexp='.*{{ item.key }}$' line="{{ item.key }}={{ item.value }}" state=present
-  with_dict: "{{ roles[inventory_hostname].vcenter_manager }} | default ({})"
-  when: roles[inventory_hostname].vcenter_manager.key is defined
+  with_dict: "{{ roles[instance_name].vcenter_manager }}"
   ignore_errors: yes
   no_log: True
 
+- name: add ESXI_HOST to common_vcmanager.env
+  lineinfile:
+    dest: /etc/contrail/common_vcmanager.env
+    regexp: '.*ESXI_HOST$'
+    line: "ESXI_HOST={{ instances[instance_name].esxi_host }}"
+
 - name: update image
   shell: "docker pull {{ container_registry }}/{{ item }}:{{ contrail_version_tag }}"
   with_items:
diff --git a/playbooks/roles/install_contrail/templates/contrail-vcenter-manager.yaml.j2 b/playbooks/roles/install_contrail/templates/contrail-vcenter-manager.yaml.j2
index 91fc764d..2c4f5374 100644
--- a/playbooks/roles/install_contrail/templates/contrail-vcenter-manager.yaml.j2
+++ b/playbooks/roles/install_contrail/templates/contrail-vcenter-manager.yaml.j2
@@ -4,20 +4,8 @@ services:
     image: "{{ container_registry }}/contrail-vcenter-manager:{{ contrail_version_tag }}"
     network_mode: "host"
     env_file: /etc/contrail/common_vcmanager.env
-    environment:
-      - VCENTER_SERVER={{ vcenter_server }}
-      - VCENTER_USERNAME={{ vcenter_username }}
-      - VCENTER_PASSWORD={{ vcenter_password }}
-      - VCENTER_DATACENTER={{ vcenter_datacenter }}
-      - ESXI_HOST={{ esxi_host }}
-      - ESXI_USERNAME={{ esxi_username }}
-      - ESXI_PASSWORD={{ esxi_password }}
-      - ESXI_DATACENTER={{ esxi_datacenter }}
-      
     volumes:
       - /var/log/contrail:/var/log/contrail
     restart: on-failure
     stdin_open: {{ stdin_open }}
     tty: {{ tty }}
-
-