diff --git a/values.production.template.yaml b/values.production.template.yaml
index 2d10dffa..955404a7 100644
--- a/values.production.template.yaml
+++ b/values.production.template.yaml
@@ -93,7 +93,7 @@ osm-seed:
         effective_io_concurrency = 200
         max_wal_size = 1GB
         min_wal_size = 256MB
-        random_page_cost = 1.1
+        random_page_cost = 1.0
         effective_cache_size = 8GB
         log_min_duration_statement = 3000
         log_connections = on
@@ -113,8 +113,8 @@ osm-seed:
         max_parallel_workers_per_gather = 2
         max_parallel_workers = 4
         max_worker_processes = 4
-        parallel_tuple_cost = 0.1
-        parallel_setup_cost = 1000
+        parallel_tuple_cost = 0.05
+        parallel_setup_cost = 500
         min_parallel_table_scan_size = 2MB
         min_parallel_index_scan_size = 256kB
         session_preload_libraries = 'auto_explain'
@@ -386,14 +386,14 @@ osm-seed:
       values: |
         listen_addresses = '*'
         max_connections = 100
-        shared_buffers = 8GB
+        shared_buffers = 10GB
         work_mem = 256MB
         maintenance_work_mem = 2GB
         dynamic_shared_memory_type = posix
         effective_io_concurrency = 300
         max_wal_size = 4GB
         min_wal_size = 512MB
-        random_page_cost = 1.1
+        random_page_cost = 1.0
         effective_cache_size = 24GB
         log_min_duration_statement = 15000
         log_connections = on
@@ -411,16 +411,16 @@ osm-seed:
         default_text_search_config = 'pg_catalog.english'
 
         # Parallelism settings
-        max_parallel_workers_per_gather = 4
-        max_parallel_workers = 8
-        max_worker_processes = 8
-        parallel_tuple_cost = 0.1
-        parallel_setup_cost = 1000
+        max_parallel_workers_per_gather = 8
+        max_parallel_workers = 16
+        max_worker_processes = 16
+        parallel_tuple_cost = 0.05
+        parallel_setup_cost = 500
         min_parallel_table_scan_size = 8MB
         min_parallel_index_scan_size = 512kB
 
         # Enable auto_explain and pg_stat_statements
-        shared_preload_libraries = 'auto_explain,pg_stat_statements'
+        shared_preload_libraries = 'auto_explain'
         auto_explain.log_min_duration = '10s'
 
         # Timeout settings
@@ -429,17 +429,17 @@ osm-seed:
         tcp_keepalives_count = 10
 
         # Disable join options for routes
-        enable_mergejoin = false
-        enable_hashjoin = false
+        enable_mergejoin = true
+        enable_hashjoin = true
 
         # Timeout settings for queries
         statement_timeout = '600s'
         lock_timeout = '60s'
-        idle_in_transaction_session_timeout = '600s'
+        idle_in_transaction_session_timeout = '300s'
 
         # pg_stat_statements settings
         pg_stat_statements.max = 15000
-        pg_stat_statements.track = all
+        pg_stat_statements.track = none
         
   # ====================================================================================================
   # Variables for tiler-imposm
@@ -929,7 +929,7 @@ ohm:
       SQS_QUEUE_URL: {{PRODUCTION_SQS_QUEUE_URL}}
       NODEGROUP_TYPE: web_large # Nodegroup type to run the job
       MAX_ACTIVE_JOBS: 10 # Maximum number of active jobs in high concurrency queue
-      DELETE_OLD_JOBS_AGE: 3600 # 1 hours
+      DELETE_OLD_JOBS_AGE: 60 # 1 hours
       EXECUTE_PURGE: 'true'
       EXECUTE_SEED: 'false'
       PURGE_CONCURRENCY: 16