diff --git a/odroid.yaml b/odroid.yaml
index 38d2c56..1ab3d28 100644
--- a/odroid.yaml
+++ b/odroid.yaml
@@ -48,11 +48,11 @@
             label: "{{ item.key }}"
 
         - name: Backup mysql databases
-          shell: docker exec mysql8 mysqldump -u{{ mysql_user }} -p{{ mysql_password }} {{ item }} > {{ backup_dir }}/{{ item }}/db-{{ ansible_date_time.iso8601_basic_short }}.sql
+          shell: docker exec {{ item }}-db mysqldump -u{{ item }} -p{{ item + '-password' }} {{ item }} > {{ backup_dir }}/{{ item }}/db-{{ ansible_date_time.iso8601_basic_short }}.sql
           loop: "{{ mysql_databases }}"
 
         - name: Backup postgres databases
-          shell: docker exec psql14 pg_dump -U {{ postgres_user }} {{ item }} > {{ backup_dir }}/{{ item }}/db-{{ ansible_date_time.iso8601_basic_short }}.sql
+          shell: docker exec {{ item }}-db pg_dump -U {{ item }} {{ item }} > {{ backup_dir }}/{{ item }}/db-{{ ansible_date_time.iso8601_basic_short }}.sql
           loop: "{{ postgres_databases }}"
 
         - name: Compress database backup files