diff --git a/roles/freepbx/tasks/main.yml b/roles/freepbx/tasks/main.yml
index 208e3dc..670c43a 100644
--- a/roles/freepbx/tasks/main.yml
+++ b/roles/freepbx/tasks/main.yml
@@ -92,7 +92,8 @@
     - dir: cgi-bin
     - dir: meta
       mode: 700
-    - dir: db_dumps
+    - dir: backup
+      mode: 700
     - dir: tmp
     - dir: sessions
     - dir: archives
@@ -104,6 +105,12 @@
     - dir: provisioning/bmp
   tags: fpbx
 
+- name: Remove obsolete directories
+  file: path={{ fpbx_root_dir }}/{{ item }} state=absent
+  loop:
+    - db_dumps
+  tags: fpbx
+
 - name: Create /tftpboot
   file: dest=/tftpboot src={{ fpbx_root_dir }}/provisioning state=link
   tags: fpbx
diff --git a/roles/freepbx/templates/post_backup.sh.j2 b/roles/freepbx/templates/post_backup.sh.j2
index fa29b22..3346c11 100644
--- a/roles/freepbx/templates/post_backup.sh.j2
+++ b/roles/freepbx/templates/post_backup.sh.j2
@@ -1,3 +1,3 @@
 #!/bin/bash -e
 
-rm -f {{ fpbx_root_dir }}/db_dump/*
+rm -f {{ fpbx_root_dir }}/backup/*
diff --git a/roles/freepbx/templates/pre_backup.sh.j2 b/roles/freepbx/templates/pre_backup.sh.j2
index 1a15cb0..69af611 100644
--- a/roles/freepbx/templates/pre_backup.sh.j2
+++ b/roles/freepbx/templates/pre_backup.sh.j2
@@ -1,12 +1,18 @@
 #!/bin/bash -e
 
-/usr/bin/mysqldump --user={{ fpbx_db_user }} \
-                   --password='{{ fpbx_db_pass }}' \
-                   --host={{ fpbx_db_server }} \
-                   --quick --single-transaction \
-                   --add-drop-table {{ fpbx_db_name }} | lz4 -c > {{ fpbx_root_dir }}/db_dumps/{{ fpbx_db_name }}.sql.lz4
-/usr/bin/mysqldump --user={{ fpbx_db_user }} \
-                   --password='{{ fpbx_db_pass }}' \
-                   --host={{ fpbx_db_server }} \
-                   --quick --single-transaction \
-                   --add-drop-table {{ fpbx_cdr_db_name }} | lz4 -c > {{ fpbx_root_dir }}/db_dumps/{{ fpbx_db_name }}.sql.lz4
+/usr/bin/mysqldump \
+  --quick --single-transaction \
+{% if fpbx_db_server not in ['127.0.0.1', 'localhost'] %}
+  --user={{ fpbx_db_user }} \
+  --password='{{ fpbx_db_pass }}' \
+  --host={{ fpbx_db_server }} \
+{% endif %}
+  --add-drop-table {{ fpbx_db_name }} | zstd -T0 -c > {{ fpbx_root_dir }}/backup/{{ fpbx_db_name }}.sql.zstd
+/usr/bin/mysqldump \
+  --quick --single-transaction \
+{% if fpbx_db_server not in ['127.0.0.1', 'localhost'] %}
+  --user={{ fpbx_db_user }} \
+  --password='{{ fpbx_db_pass }}' \
+  --host={{ fpbx_db_server }} \
+{% endif %}
+  --add-drop-table {{ fpbx_cdr_db_name }} | zstd -T0 -c > {{ fpbx_root_dir }}/backup/{{ fpbx_cdr_db_name }}.sql.zstd