diff --git a/salt/nginx/etc/nginx.conf b/salt/nginx/etc/nginx.conf
index ea820442b..7a238fa54 100644
--- a/salt/nginx/etc/nginx.conf
+++ b/salt/nginx/etc/nginx.conf
@@ -175,8 +175,8 @@ http {
 			auth_request_set      $userid $upstream_http_x_kratos_authenticated_identity_id;
 			proxy_set_header      x-user-id $userid;
 			proxy_pass            http://{{ manager_ip }}:9822/;
-			proxy_read_timeout    90;
-			proxy_connect_timeout 90;
+			proxy_read_timeout    300;
+			proxy_connect_timeout 300;
 			proxy_set_header      Host $host;
 			proxy_set_header      X-Real-IP $remote_addr;
 			proxy_set_header      X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -261,8 +261,8 @@ http {
 			auth_request          /auth/sessions/whoami;
 			rewrite               /kibana/(.*) /$1 break;
 			proxy_pass            http://{{ manager_ip }}:5601/;
-			proxy_read_timeout    90;
-			proxy_connect_timeout 90;
+			proxy_read_timeout    300;
+			proxy_connect_timeout 300;
 			proxy_set_header      Host $host;
 			proxy_set_header      X-Real-IP $remote_addr;
 			proxy_set_header      X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -341,8 +341,8 @@ http {
 		
 		location /soctopus/ {
 			proxy_pass            http://{{ manager_ip }}:7000/;
-			proxy_read_timeout    90;
-			proxy_connect_timeout 90;
+			proxy_read_timeout    300;
+			proxy_connect_timeout 300;
 			proxy_set_header      Host $host;
 			proxy_set_header      X-Real-IP $remote_addr;
 			proxy_set_header      X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/salt/soc/files/soc/soc.json b/salt/soc/files/soc/soc.json
index 8048970f3..e275ec28b 100644
--- a/salt/soc/files/soc/soc.json
+++ b/salt/soc/files/soc/soc.json
@@ -50,7 +50,8 @@
         "username": "",
         "password": "",
         "cacheMs": {{ ES_FIELDCAPS_CACHE }},
-        "verifyCert": false
+        "verifyCert": false,
+        "timeoutMs": {{ API_TIMEOUT }}
       },
       "influxdb": {
 {%- if grains['role'] in ['so-import'] or (grains['role'] == 'so-eval' and GRAFANA == 0) %}