diff --git a/roles/copr/backend/templates/copr-be.conf b/roles/copr/backend/templates/copr-be.conf
index 4f82762612..fe976a0554 100644
--- a/roles/copr/backend/templates/copr-be.conf
+++ b/roles/copr/backend/templates/copr-be.conf
@@ -83,4 +83,4 @@ spawn_in_advance={{ spawn_in_advance }}
 
 [builder]
 # default is 1800
-timeout=3600
+timeout=21600
diff --git a/roles/copr/frontend/tasks/psql_setup.yml b/roles/copr/frontend/tasks/psql_setup.yml
index 9cd9a9f669..cc341c5a57 100644
--- a/roles/copr/frontend/tasks/psql_setup.yml
+++ b/roles/copr/frontend/tasks/psql_setup.yml
@@ -23,6 +23,8 @@
   tags:
   - config
 
+# TODO: I think we missing user creation, check it we do it somewhere else ...
+
 - name: Copy over backup scriplet
   copy: src="{{ files }}/../roles/postgresql_server/files/backup-database" dest=/usr/local/bin/backup-database mode=0755
   tags: