diff --git a/salt/master/single.yml b/salt/master/single.yml
index 815c766..710b6f7 100644
--- a/salt/master/single.yml
+++ b/salt/master/single.yml
@@ -15,6 +15,7 @@
       worker_threads: ${_param:salt_master_worker_threads}
       max_open_files: 15000
       command_timeout: 10
+      gather_job_timeout: 40
       peer:
         '.*':
           - x509.sign_remote_certificate
diff --git a/salt/minion/single.yml b/salt/minion/single.yml
index 9d20aff..943474b 100644
--- a/salt/minion/single.yml
+++ b/salt/minion/single.yml
@@ -7,4 +7,6 @@
       recon_default: 1000
       recon_max: 60000
       recon_randomize: True
-      auth_timeout: 60
\ No newline at end of file
+      auth_timeout: 180
+      master_tries: -1
+      auth_tries: 10