diff --git a/aws_crowd_dc_node.yml b/aws_crowd_dc_node.yml
index aadb30c..f2755e0 100644
--- a/aws_crowd_dc_node.yml
+++ b/aws_crowd_dc_node.yml
@@ -8,6 +8,7 @@
     atl_product_user: "crowd"
     atl_product_edition: "crowd"
     atl_use_system_jdk: true
+    atl_download_format: "tarball"
 
   roles:
     - role: linux_common
diff --git a/roles/product_install/defaults/main.yml b/roles/product_install/defaults/main.yml
index 2a04023..211e76e 100644
--- a/roles/product_install/defaults/main.yml
+++ b/roles/product_install/defaults/main.yml
@@ -8,16 +8,15 @@ atl_product_latest_version_url: "https://marketplace.atlassian.com/rest/2/applic
 atl_product_version_cache_dir: "{{ atl_product_home_shared }}"
 atl_product_version_cache: "{{ atl_product_home_shared }}/{{ atl_product_edition }}.version"
 
-atl_download_format: 'tarball'
+atl_download_format: 'installer'
 atl_download_format_suffix_map:
   installer: '-x64.bin'
   tarball: '.tar.gz'
 atl_download_suffix: "{{ atl_download_format_suffix_map[atl_download_format] }}"
-atl_crowd_suffix: "{{ atl_download_format_suffix_map[atl_download_format] }}"
 
 atl_release_base_url: "https://product-downloads.atlassian.com/software"
 atl_product_base_url: "{{ atl_release_base_url }}/{{ atl_product_family }}/downloads"
-atl_product_download_url: "{{ atl_product_base_url }}/atlassian-{{ atl_download_edition | default(atl_product_edition) }}-{{ atl_product_version }}{{ atl_crowd_suffix }}"
+atl_product_download_url: "{{ atl_product_base_url }}/atlassian-{{ atl_download_edition | default(atl_product_edition) }}-{{ atl_product_version }}{{ atl_download_suffix }}"
 
 atl_product_download_filename: "{{ atl_download_edition | default(atl_product_edition) }}.{{ atl_product_version }}{{ atl_download_suffix }}"
 atl_product_download: "{{ atl_installer_temp }}/{{ atl_product_download_filename }}"
diff --git a/roles/product_install/tasks/main.yml b/roles/product_install/tasks/main.yml
index e0bf7e7..5278658 100644
--- a/roles/product_install/tasks/main.yml
+++ b/roles/product_install/tasks/main.yml
@@ -142,6 +142,7 @@
     src: "{{ atl_product_family }}.varfile.j2"
     dest: "{{ atl_product_varfile }}"
     mode: 0755
+  when: atl_product_edition!= "crowd"
 
 # NOTE: We run the installer as the user rather than root to limit its
 # actions. For example, if root and the 'jira' user exists then it
@@ -155,6 +156,10 @@
   become_user: "{{ atl_product_user }}"
   when: atl_product_edition!= "crowd"
 
+
+- debug: 
+    msg: "FORMAT - {{ atl_download_format }}"
+
 - name: Unpack the downloaded application depending on format
   include_tasks: "unpack_{{ atl_download_format }}.yml"