diff --git a/config/nginx.conf.erb b/config/nginx.conf.erb
index cae7583a38a..f9541b3d1b4 100644
--- a/config/nginx.conf.erb
+++ b/config/nginx.conf.erb
@@ -132,13 +132,27 @@ http {
 		server_name _;
 		keepalive_timeout 5;
 
-		location ~ ^/assets/ {
+		location ~ ^/(assets|ember-fetch|moment)/ {
 			add_header X-Content-Type-Options nosniff;
 			add_header Cache-Control public;
 			root dist;
 			expires max;
 		}
 
+		location ~ ^/cargo-[0-9a-f]*\.png$ {
+			add_header X-Content-Type-Options nosniff;
+			add_header Cache-Control public;
+			root dist;
+			expires max;
+		}
+
+		location ~ /(favicon\.ico|robots\.txt|opensearch\.xml) {
+			add_header X-Content-Type-Options nosniff;
+			add_header Cache-Control public;
+			root dist;
+			expires 1d;
+		}
+
 		add_header X-Content-Type-Options "nosniff";
 		add_header X-Frame-Options "SAMEORIGIN";
 		add_header X-XSS-Protection "1; mode=block";