diff --git a/roles/database_backup/database_backup-mysql/tasks/deploy-rolling.yml b/roles/database_backup/database_backup-mysql/tasks/deploy-rolling.yml
index 71fa7580..88b51523 100644
--- a/roles/database_backup/database_backup-mysql/tasks/deploy-rolling.yml
+++ b/roles/database_backup/database_backup-mysql/tasks/deploy-rolling.yml
@@ -7,10 +7,20 @@
   # Note: we don't use the mysql_db Ansible module on purpose.
   # If database already exists, we want to fail and not override it
   # with previous build.
+  # @TODO fix this so we check if the database exists and exit with
+  # the proper plugin instead of using command.
 - name: Create new database.
-  ansible.builtin.command: mysql --defaults-extra-file={{ database.credentials_file }} -e "CREATE DATABASE {{ _mysql_build_database_name }};"
+  ansible.builtin.command: mysql --defaults-extra-file={{ database.credentials_file }} -e "CREATE DATABASE \`{{ _mysql_build_database_name }}\`;"
   run_once: true
 
+#- name: Create a new database.
+#  community.mysql.mysql_db:
+#    name: "{{ _mysql_build_database_name }}"
+#    state: present
+#    config_file: "{{ database.credentials_file }}"
+#    config_overrides_defaults: true
+#  run_once: true
+
 - name: Populate new database.
   ansible.builtin.shell: "mysqldump --defaults-extra-file={{ database.credentials_file }} {{ mysql_backup.mysqldump_params }} {{ _mysql_previous_build_database_name }} | mysql --defaults-extra-file={{ database.credentials_file }} {{ _mysql_build_database_name }}"
   when: previous_build_number > 0