diff --git a/roles/sync/database_sync/database_sync-mysql/defaults/main.yml b/roles/sync/database_sync/database_sync-mysql/defaults/main.yml
index 72add57e..763a12ec 100644
--- a/roles/sync/database_sync/database_sync-mysql/defaults/main.yml
+++ b/roles/sync/database_sync/database_sync-mysql/defaults/main.yml
@@ -2,6 +2,7 @@
 mysql_sync:
   mysqldump_params: "{{ _mysqldump_params }}" # set in _init but you can override here
   cleanup: true # if false leaves tmp database dump on deploy server for debugging purposes
+  use_gzip: false # Default is bzip2, set to true if you want to use
   databases:
     - source:
         # Name of the database to take a dump from.
@@ -24,8 +25,6 @@ mysql_sync:
         dumps_directory: "/home/{{ deploy_user }}/shared/{{ project_name }}_{{ build_type }}/db_backups/mysql/regular"
         # If the source is on an ASG, provide the ASG name here. Otherwise, leave empty.
         asg: ""
-        # Default is bzip2, set to true if you want to use gzip.
-        use_gzip: false
       target:
         database: "{{ project_name }}_dev"
         credentials_file: "/home/{{ deploy_user }}/.mysql.creds"
diff --git a/roles/sync/database_sync/database_sync-mysql/tasks/sync.yml b/roles/sync/database_sync/database_sync-mysql/tasks/sync.yml
index 5be6f8a9..8075537e 100644
--- a/roles/sync/database_sync/database_sync-mysql/tasks/sync.yml
+++ b/roles/sync/database_sync/database_sync-mysql/tasks/sync.yml
@@ -42,7 +42,8 @@
 - name: Register remote dump name (from database) - GZIP.
   ansible.builtin.set_fact:
     mysql_sync_source_dump_path: "/tmp/{{ database.source.database }}_{{ build_number }}_source.sql.gz"
-  when: database.source.use_gzip
+  when: 
+    - mysql_sync.use_gzip
 
 - name: Get source last known good build number.
   ansible.builtin.command:
@@ -80,7 +81,7 @@
   delegate_to: "{{ database.source.host }}"
   when:
     - database.source.fresh_db
-    - database.source.use_gzip
+    - mysql_sync.use_gzip
 
 - name: Find source database host.
   ansible.builtin.command:
@@ -110,7 +111,8 @@
 - name: Register tmp target dump name - GZIP.
   ansible.builtin.set_fact:
     mysql_sync_target_dump_path: "/tmp/{{ database.target.database }}_{{ build_number }}_target.sql.gz"
-  when: database.source.use_gzip
+  when:
+    - mysql_sync.use_gzip
 
 - name: Register tmp unpacked target dump name.
   ansible.builtin.set_fact:
@@ -150,7 +152,8 @@
     dest: "{{ _ce_deploy_build_tmp_dir }}/{{ database.target.database }}.sql.gz"
     flat: true
   delegate_to: "{{ database.source.host }}"
-  when: database.source.use_gzip
+  when:
+    - mysql_sync.use_gzip
 
 - name: Copy dump file to destination - BZIP2.
   ansible.builtin.copy:
@@ -161,7 +164,8 @@
   ansible.builtin.copy:
     src: "{{ _ce_deploy_build_tmp_dir }}/{{ database.target.database }}.sql.gz"
     dest: "{{ mysql_sync_target_dump_path }}"
-  when: database.source.use_gzip
+  when:
+    - mysql_sync.use_gzip
 
 - name: Unpack dump file - BZIP2.
   ansible.builtin.shell: "bzip2 -d -c {{ mysql_sync_target_dump_path }} > {{ mysql_sync_target_dump_unpacked_path }}"
@@ -172,7 +176,8 @@
   ansible.builtin.shell: "gzip -d -c {{ mysql_sync_target_dump_path }} > {{ mysql_sync_target_dump_unpacked_path }}"
   args:
     executable: /bin/bash
-  when: database.source.use_gzip
+  when:
+    - mysql_sync.use_gzip
 
 - name: Delete temporary dump file on target.
   ansible.builtin.file: