diff --git a/roles/service/tasks/database.yaml b/roles/service/tasks/database.yaml
index b7f18dd..0c52ff5 100644
--- a/roles/service/tasks/database.yaml
+++ b/roles/service/tasks/database.yaml
@@ -1,7 +1,7 @@
 ---
-- name: Set database name
-  ansible.builtin.set_fact:
-    _service_database_name: "{{ service_name }}-{{ service_database_type }}"
+- name: Include database variables
+  ansible.builtin.include_vars:
+    file: database.yaml
 
 - name: Database container for {{ service_name }}
   ansible.builtin.include_role:
diff --git a/roles/service/vars/database.yaml b/roles/service/vars/database.yaml
new file mode 100644
index 0000000..f0375db
--- /dev/null
+++ b/roles/service/vars/database.yaml
@@ -0,0 +1,2 @@
+---
+_service_database_name: "{{ service_name }}-{{ service_database_type }}"