diff --git a/templates/services/droneci_autoscaler_compose.yml.j2 b/templates/services/droneci_autoscaler_compose.yml.j2
index 306e1ab..742cbf5 100644
--- a/templates/services/droneci_autoscaler_compose.yml.j2
+++ b/templates/services/droneci_autoscaler_compose.yml.j2
@@ -73,7 +73,7 @@ services:
       {% endif %}
       {% if droneci_autoscaler_db_type == "pgsql" %}
       - DRONE_DATABASE_DRIVER=postgres
-      - DRONE_DATABASE_DATASOURCE=postgres://{{ droneci_autoscaler_db_user }}:{{ droneci_autoscaler_db_password }}@{{ droneci_autoscaler_db_server }}/{{ droneci_autoscaler_db_name }}?sslmode={{ droneci_autoscaler_db_ssl_mode }}
+      - DRONE_DATABASE_DATASOURCE=postgres://{{ droneci_autoscaler_db_user }}:{{ droneci_autoscaler_db_password }}@{{ droneci_autoscaler_db_server }}/{{ inst.db_name | default(droneci_autoscaler_db_name) }}?sslmode={{ droneci_autoscaler_db_ssl_mode }}
       {% endif %}
       {% for item in inst.provider_config %}
       - {{ item.name | upper }}={{ item.value }}