diff --git a/playbooks/hosts/koschei.cloud.fedoraproject.org.yml b/playbooks/hosts/koschei.cloud.fedoraproject.org.yml
index aeab3f48ea..ecee343975 100644
--- a/playbooks/hosts/koschei.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/koschei.cloud.fedoraproject.org.yml
@@ -24,6 +24,8 @@
 
   vars:
   - koschei_pgsql_hostname: localhost
+  - koscheiuser_db_password: "{{ koschei_pgsql_password }}"
+  - koscheiadmin_db_password: "{{ koschei_pgsql_password }}"
   - koschei_koji_hub: koji.fedoraproject.org
   - koschei_kojipkgs: kojipkgs.fedoraproject.org
   - koschei_koji_tag: f23
diff --git a/roles/koschei/templates/config.cfg.j2 b/roles/koschei/templates/config.cfg.j2
index 6d84509dcc..23ed9584ff 100644
--- a/roles/koschei/templates/config.cfg.j2
+++ b/roles/koschei/templates/config.cfg.j2
@@ -6,7 +6,7 @@ config = {
     "database_config": {
         "host": "{{ koschei_pgsql_hostname }}",
         "username": "koscheiuser",
-        "password": "{{ koschei_pgsql_password }}",
+        "password": "{{ koscheiuser_db_password }}",
         "database": "koschei"
     },
     "koji_config": {