diff --git a/inventory/host_vars/db-koji01.phx2.fedoraproject.org b/inventory/host_vars/db-koji01.phx2.fedoraproject.org
index 49a19d8473..587e561e9c 100644
--- a/inventory/host_vars/db-koji01.phx2.fedoraproject.org
+++ b/inventory/host_vars/db-koji01.phx2.fedoraproject.org
@@ -45,5 +45,5 @@ nrpe_procs_warn: 600
 nrpe_procs_crit: 700
 
 db_backup_dir: ['/backups']
-shared_buffers: "32GB"
-effective_cache_size: "32GB"
+shared_buffers: "30GB"
+effective_cache_size: "90GB"
diff --git a/roles/postgresql_server/templates/postgresql.conf b/roles/postgresql_server/templates/postgresql.conf
index b148442d99..cbaaaaeb82 100644
--- a/roles/postgresql_server/templates/postgresql.conf
+++ b/roles/postgresql_server/templates/postgresql.conf
@@ -121,8 +121,8 @@ shared_buffers = {{ shared_buffers }}   # min 128kB or max_connections*16kB
 
 # 8 MB is probably on the high side.  We can probably do with 4MB.  But we
 # were seeing a problem and we have the RAM so we're going to try this.   
-work_mem = 4MB                          # min 64kB
-maintenance_work_mem = 1024MB           # min 1MB
+work_mem = 157286kB
+maintenance_work_mem = 2GB              # min 1MB
 #max_stack_depth = 2MB                  # min 100kB                       
 
 # - Free Space Map -
@@ -169,7 +169,7 @@ wal_sync_method = fdatasync             # the default is the first option
                                         #   fsync_writethrough                  
                                         #   open_sync                           
 #full_page_writes = on                  # recover from partial page writes      
-wal_buffers = 64kB                      # min 32kB                              
+wal_buffers = 16MB                      # min 32kB                              
                                         # (change requires restart)             
 #wal_writer_delay = 200ms               # 1-10000 milliseconds                  
 
@@ -212,7 +212,7 @@ checkpoint_warning = 180s               # 0 is off
 # - Planner Cost Constants -
 
 #seq_page_cost = 1.0                    # measured on an arbitrary scale
-random_page_cost = 3.0                  # same scale as above           
+random_page_cost = 1.1                  # same scale as above           
 #cpu_tuple_cost = 0.01                  # same scale as above           
 #cpu_index_tuple_cost = 0.005           # same scale as above           
 #cpu_operator_cost = 0.0025             # same scale as above           
@@ -502,4 +502,6 @@ default_text_search_config = 'pg_catalog.english'
 #------------------------------------------------------------------------------
 
 #custom_variable_classes = ''           # list of custom variable class names
-
+#
+# Number of concurrent i/o operations at the same time. The default is 1.
+effective_io_concurrency = 100