diff --git a/docs/roles/database_backup/database_backup-mysql.md b/docs/roles/database_backup/database_backup-mysql.md
index b52413bf..c52620f6 100644
--- a/docs/roles/database_backup/database_backup-mysql.md
+++ b/docs/roles/database_backup/database_backup-mysql.md
@@ -22,8 +22,8 @@ mysql_backup:
   # This is useful for locked-down setups where you do not have GRANT permissions.
   credentials_handling: rotate
   databases:
-    - database: "{{ project_name }}_{{ build_type }}"
-      user: "{{ project_name }}_{{ build_type }}"
+    - database: "{{ (project_name + '_' + build_type) | regex_replace('-', '_') }}" # avoid hyphens in MySQL database names
+      user: "{{ (project_name + '_' + build_type) | truncate(32, true, '', 0) }}" # 32 char limit
       credentials_file: "/home/{{ deploy_user }}/.mysql.creds"
 
 ```
diff --git a/roles/database_apply/database_apply-drupal8/tasks/main.yml b/roles/database_apply/database_apply-drupal8/tasks/main.yml
index 7faf684f..7faa03c7 100644
--- a/roles/database_apply/database_apply-drupal8/tasks/main.yml
+++ b/roles/database_apply/database_apply-drupal8/tasks/main.yml
@@ -26,7 +26,7 @@
   register: _drush_output
 
 - name: Sync database.
-  ansible.builtin.import_role:
+  ansible.builtin.include_role:
     name: sync/database_sync
   vars:
     mysql_sync: "{{ site.mysql_sync }}"
@@ -39,7 +39,7 @@
     - site.mysql_sync | length > 0
 
 - name: Sync files.
-  ansible.builtin.import_role:
+  ansible.builtin.include_role:
     name: sync/files_sync
   vars:
     files_sync: "{{ site.files_sync }}"
diff --git a/roles/database_backup/database_backup-mysql/README.md b/roles/database_backup/database_backup-mysql/README.md
index b52413bf..c52620f6 100644
--- a/roles/database_backup/database_backup-mysql/README.md
+++ b/roles/database_backup/database_backup-mysql/README.md
@@ -22,8 +22,8 @@ mysql_backup:
   # This is useful for locked-down setups where you do not have GRANT permissions.
   credentials_handling: rotate
   databases:
-    - database: "{{ project_name }}_{{ build_type }}"
-      user: "{{ project_name }}_{{ build_type }}"
+    - database: "{{ (project_name + '_' + build_type) | regex_replace('-', '_') }}" # avoid hyphens in MySQL database names
+      user: "{{ (project_name + '_' + build_type) | truncate(32, true, '', 0) }}" # 32 char limit
       credentials_file: "/home/{{ deploy_user }}/.mysql.creds"
 
 ```
diff --git a/roles/database_backup/database_backup-mysql/defaults/main.yml b/roles/database_backup/database_backup-mysql/defaults/main.yml
index f7e070e9..1cbc2e11 100644
--- a/roles/database_backup/database_backup-mysql/defaults/main.yml
+++ b/roles/database_backup/database_backup-mysql/defaults/main.yml
@@ -17,6 +17,6 @@ mysql_backup:
   # This is useful for locked-down setups where you do not have GRANT permissions.
   credentials_handling: rotate
   databases:
-    - database: "{{ project_name }}_{{ build_type }}"
-      user: "{{ project_name }}_{{ build_type }}"
+    - database: "{{ (project_name + '_' + build_type) | regex_replace('-', '_') }}" # avoid hyphens in MySQL database names
+      user: "{{ (project_name + '_' + build_type) | truncate(32, true, '', 0) }}" # 32 char limit
       credentials_file: "/home/{{ deploy_user }}/.mysql.creds"