diff --git a/roles/base-config-nsx/tasks/main.yml b/roles/base-config-nsx/tasks/main.yml
index 5a2206f..f3e6b8b 100644
--- a/roles/base-config-nsx/tasks/main.yml
+++ b/roles/base-config-nsx/tasks/main.yml
@@ -30,6 +30,7 @@
     password: "{{ vcPassword }}"
     datacenter_name: "{{ targetDatacenterName }}"
     cluster_name: "{{ targetClusters.cluster1.clusterName }}"
+    validate_certs: False
   register: vcenter_mgmt_cluster_moid
   tags: vsphere_facts
 
@@ -41,6 +42,7 @@
     password: "{{ vcPassword }}"
     datacenter_name: "{{ targetDatacenterName }}"
     datastore_name: "{{ nsxControllerDatastore }}"
+    validate_certs: False
   register: vcenter_mgmt_datastore_moid
   tags: vsphere_facts
 
@@ -52,6 +54,7 @@
     password: "{{ vcPassword }}"
     datacenter_name: "{{ targetDatacenterName }}"
     portgroup_name: "{{ nsxControllerPortGroup }}"
+    validate_certs: False
   register: vcenter_mgmt_portgroup_moid
   tags: vsphere_facts
 
@@ -92,6 +95,7 @@
     password: "{{ vcPassword }}"
     datacenter_name: "{{ targetDatacenterName }}"
     cluster_name: "{{ targetClusters.cluster1.clusterName }}"
+    validate_certs: False
   register: vcenter_compute_cluster_moid
   tags: vsphere_facts
 
@@ -121,6 +125,7 @@
     password: "{{ vcPassword }}"
     datacenter_name: "{{ targetDatacenterName }}"
     dvs_name: "{{ targetVdsName }}"
+    validate_certs: False
   register: vcenter_dvs_moid
   tags: vsphere_facts
 
diff --git a/test_topology.yml b/test_topology.yml
index 57e1105..7a036ae 100644
--- a/test_topology.yml
+++ b/test_topology.yml
@@ -24,6 +24,7 @@
       password: "{{ vcenter_pwd }}"
       datacenter_name: "{{ vcenter_dc }}"
       datastore_name: "{{ vcenter_datastore }}"
+      validate_certs: False
     register: gather_moids_ds
     tags: moids
   - name: gather moid for cl
@@ -33,6 +34,7 @@
       password: "{{ vcenter_pwd }}"
       datacenter_name: "{{ vcenter_dc }}"
       cluster_name: "{{ vcenter_edge_cluster }}"
+      validate_certs: False
     register: gather_moids_cl
     tags: moids
   - name: gather moid for uplink vnic
@@ -42,6 +44,7 @@
       password: "{{ vcenter_pwd }}"
       datacenter_name: "{{ vcenter_dc }}"
       portgroup_name: 'vlan41'
+      validate_certs: False
     register: gather_moids_upl_pg
     tags: moids
   - name: gather moid for mgmt portgroup
@@ -51,6 +54,7 @@
       password: "{{ vcenter_pwd }}"
       datacenter_name: "{{ vcenter_dc }}"
       portgroup_name: 'vlan45'
+      validate_certs: False
     register: gather_moids_pg
     tags: moids
 
diff --git a/test_vcenter_gather_moids.yml b/test_vcenter_gather_moids.yml
index 7def9ea..0027d4e 100644
--- a/test_vcenter_gather_moids.yml
+++ b/test_vcenter_gather_moids.yml
@@ -3,19 +3,20 @@
   connection: local
   gather_facts: False
   vars_files:
-     - answerfile_new_nsxman.yml
+     - answerfile_TPM_Lab.yml
   tasks:
   - name: Gather vCenter MOIDs
     vcenter_gather_moids:
-      hostname: 'testvc.emea.nicira'
-      username: 'administrator@vsphere.local'
-      password: 'vmware'
-      datacenter_name: 'nsxlabdc'
-      cluster_name: 'compute'
+      hostname: 'vc01.yves.local'
+      username: 'administrator@yves.local'
+      password: 'VMware1!'
+      datacenter_name: 'tpm-lab'
+      cluster_name: 'management'
       #resourcepool_name: 'test_rp'
       #dvs_name: 'TransportVDS'
       #portgroup_name: 'VM Network'
       #datastore_name: 'NFS-Storage03'
+      validate_certs: False
     register: gather_moids_output
 
   - debug: msg="The searched moid is {{ gather_moids_output.object_id }}"