diff --git a/validations/opdk-external-port-connectivity-validator.yml b/opdk-external-port-connectivity-validator.yml
similarity index 98%
rename from validations/opdk-external-port-connectivity-validator.yml
rename to opdk-external-port-connectivity-validator.yml
index e78115c..67d96c5 100644
--- a/validations/opdk-external-port-connectivity-validator.yml
+++ b/opdk-external-port-connectivity-validator.yml
@@ -212,17 +212,18 @@
   tags:
   - ms_read_ldap
 
-
 - hosts: pg
+  gather_facts: no
+  tags: ['pg']
   roles:
   - { role: apigee-opdk-validate-external-port-connectivity-server, check_port: '{{ pg_jmx_port }}' }
   - { role: apigee-opdk-validate-external-port-connectivity-server, check_port: '{{ pg_int_mgmt_port }}' }
   - { role: apigee-opdk-validate-external-port-connectivity-server, check_port: '{{ pg_db_port }}' }
   - { role: apigee-opdk-validate-external-port-connectivity-server, check_port: '{{ pg_ext_mgmt_port }}' }
-  tags:
-  - pg_read_pg
 
 - hosts: pg
+  gather_facts: no
+  tags: ['pg']
   roles:
   - { role: apigee-opdk-validate-external-port-connectivity-client, check_port: '{{ pg_jmx_port }}', target_server: "{{ hostvars[groups['pg'][0]].local_address }}" }
   - { role: apigee-opdk-validate-external-port-connectivity-client, check_port: '{{ pg_int_mgmt_port }}', target_server: "{{ hostvars[groups['pg'][0]].local_address }}" }
@@ -233,11 +234,9 @@
   - { role: apigee-opdk-validate-external-port-connectivity-client, check_port: '{{ pg_int_mgmt_port }}', target_server: "{{ hostvars[groups['pg'][1]].local_address }}" }
   - { role: apigee-opdk-validate-external-port-connectivity-client, check_port: '{{ pg_db_port }}', target_server: "{{ hostvars[groups['pg'][1]].local_address }}" }
   - { role: apigee-opdk-validate-external-port-connectivity-client, check_port: '{{ pg_ext_mgmt_port }}', target_server: "{{ hostvars[groups['pg'][1]].local_address }}" }
-  tags:
-  - pg_read_pg
-
 
 - hosts: qpid
+  gather_facts: no
   roles:
   - { role: apigee-opdk-validate-external-port-connectivity-server, check_port: '{{ qpid_jmx_port }}' }
   - { role: apigee-opdk-validate-external-port-connectivity-server, check_port: '{{ qpid_int_mgmt_port }}' }
@@ -247,7 +246,8 @@
   - pg_read_qpid
 
 - hosts: pg
-  roles: 
+  gather_facts: no
+  roles:
   - { role: apigee-opdk-validate-external-port-connectivity-client, check_port: '{{ qpid_jmx_port }}', target_server: "{{ hostvars[groups['qpid'][0]].local_address }}" }
   - { role: apigee-opdk-validate-external-port-connectivity-client, check_port: '{{ qpid_int_mgmt_port }}', target_server: "{{ hostvars[groups['qpid'][0]].local_address }}" }
   - { role: apigee-opdk-validate-external-port-connectivity-client, check_port: '{{ qpid_messaging_port }}', target_server: "{{ hostvars[groups['qpid'][0]].local_address }}" }
diff --git a/configuration/update_cache.yml b/update_cache.yml
similarity index 100%
rename from configuration/update_cache.yml
rename to update_cache.yml
diff --git a/validate-ports.yml b/validate-ports.yml
index 7afb895..5a3f206 100644
--- a/validate-ports.yml
+++ b/validate-ports.yml
@@ -1,8 +1,6 @@
 ---
-- include: configuration/update_cache.yml
-  tags:
-  - facts
+- include: update_cache.yml
+  tags: ['cache']
 
-- include: validations/opdk-external-port-connectivity-validator.yml
-  tags:
-  - validate
+- include: opdk-external-port-connectivity-validator.yml
+  tags: ['validate']