diff --git a/frontend/nginx.conf b/frontend/nginx.conf
index 20f0759..f9b7c9a 100644
--- a/frontend/nginx.conf
+++ b/frontend/nginx.conf
@@ -5,6 +5,9 @@ server {
     root /usr/share/nginx/html;
     index index.html;
 
+    # 업로드 크기 제한 (merged.bin 등 대용량 펌웨어 허용)
+    client_max_body_size 64M;
+
     # 정적 파일 서빙
     location / {
         try_files $uri $uri/ /index.html;
@@ -12,16 +15,17 @@ server {
 
     # 백엔드 API 프록시
     location /api/ {
-        proxy_pass http://backend:3000/api/;
-        proxy_set_header Host              $host;
-        proxy_set_header X-Real-IP         $remote_addr;
-        proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass         http://backend:3000/api/;
+        proxy_set_header   Host              $host;
+        proxy_set_header   X-Real-IP         $remote_addr;
+        proxy_set_header   X-Forwarded-For   $proxy_add_x_forwarded_for;
+        proxy_set_header   X-Forwarded-Proto $scheme;
+        proxy_read_timeout 120s;
     }
 
     # 펌웨어 파일 프록시
     location /firmware/ {
-        proxy_pass http://backend:3000/firmware/;
+        proxy_pass       http://backend:3000/firmware/;
         proxy_set_header Host $host;
     }
 }