diff --git a/defaults/main.yml b/defaults/main.yml
index 6a42fc0..0d7a778 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -73,7 +73,7 @@ long_running: false
 # 18.9.97.2.2
 # 18.9.97.2.3
 # 18.9.98.1
-win_skip_for_test: false
+win_skip_for_test: true
 
 #### Basic external audit enablement settings ####
 #### Precise details - per setting can be found at the bottom of this file ####
@@ -83,13 +83,13 @@ setup_audit: false
 ### The individual exe is required on the remote host
 ## This can be copied or downloaded
 # paths can be changed at the bottom of the role
-download_audit_exe: true
+download_audit_exe: false
 copy_audit_exe: false
 
 # download audit content
-download_goss_config: true
+download_goss_config: false
 
-# enable audits to run - this  runs the audit and get the latest content
+# enable audits to run - this runs the audit and get the latest content
 run_audit: false
 
 # output location for the audit
diff --git a/meta/main.yml b/meta/main.yml
index d578e55..9000c2c 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -8,6 +8,9 @@ galaxy_info:
     namespace: mindpointgroup
     min_ansible_version: 2.6
 
+# The galaxy api currently supports only Win 2008R2, 2008x64, 2008x86,
+# 2012, 2012R2, 2016, and 2019 versions. And using anything else will lower
+# galaxy score.
     platforms:
         - name: Windows
           versions:
diff --git a/tasks/main.yml b/tasks/main.yml
index c96e9e5..4287df7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,7 +6,7 @@
   tags:
       - always
 
-- name: Gather distribution info
+- name: Gather Distribution Info
   ansible.builtin.setup:
       gather_subset: distribution,!all,!min
   when:
@@ -39,8 +39,7 @@
 
 - name: Run Audit
   ansible.builtin.import_tasks: run_audit.yml
-  when:
-      - run_audit
+  when: run_audit
   vars:
       audit_time: pre
   tags:
diff --git a/tasks/run_audit.yml b/tasks/run_audit.yml
index 5486feb..6e6a272 100644
--- a/tasks/run_audit.yml
+++ b/tasks/run_audit.yml
@@ -5,7 +5,7 @@
 # Copied pre and post to capture output files.
 - name: copy the template used by ansible for consistent checks
   ansible.windows.win_template:
-      src: ansible_vars_goss.yml.j2
+      src: templates/ansible_vars_goss.yml.j2
       dest: "{{ goss_vars_path }}"
   when:
       - audit_time == 'pre'