diff --git a/make/photon/prepare/templates/nginx/nginx.http.conf.jinja b/make/photon/prepare/templates/nginx/nginx.http.conf.jinja
index e80d6e9fd..c6d2df6c1 100644
--- a/make/photon/prepare/templates/nginx/nginx.http.conf.jinja
+++ b/make/photon/prepare/templates/nginx/nginx.http.conf.jinja
@@ -112,6 +112,9 @@ http {
       proxy_set_header X-Forwarded-Proto $scheme;
       proxy_buffering off;
       proxy_request_buffering off;
+
+      proxy_send_timeout 900;
+      proxy_read_timeout 900;
     }
 
     location /service/ {
diff --git a/make/photon/prepare/templates/nginx/nginx.https.conf.jinja b/make/photon/prepare/templates/nginx/nginx.https.conf.jinja
index b5b199a91..c7e2e4c42 100644
--- a/make/photon/prepare/templates/nginx/nginx.https.conf.jinja
+++ b/make/photon/prepare/templates/nginx/nginx.https.conf.jinja
@@ -186,6 +186,8 @@ http {
       proxy_set_header X-Forwarded-Proto $scheme;
       proxy_buffering off;
       proxy_request_buffering off;
+      proxy_send_timeout 900;
+      proxy_read_timeout 900;
     }
 
     location /service/ {
diff --git a/make/photon/prepare/templates/nginx/notary.server.conf.jinja b/make/photon/prepare/templates/nginx/notary.server.conf.jinja
index 546ebd67f..ca22b7c68 100644
--- a/make/photon/prepare/templates/nginx/notary.server.conf.jinja
+++ b/make/photon/prepare/templates/nginx/notary.server.conf.jinja
@@ -6,7 +6,7 @@
     ssl_certificate_key {{ssl_cert_key}};
   
     # recommendations from https://raymii.org/s/tutorials/strong_ssl_security_on_nginx.html
-    ssl_protocols tlsv1.1 tlsv1.2;
+    ssl_protocols tlsv1.2;
     ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:';
     ssl_prefer_server_ciphers on;
     ssl_session_cache shared:ssl:10m;