diff --git a/lib/kamal/configuration/docs/proxy.yml b/lib/kamal/configuration/docs/proxy.yml
index 0c541c51..db5b9674 100644
--- a/lib/kamal/configuration/docs/proxy.yml
+++ b/lib/kamal/configuration/docs/proxy.yml
@@ -87,7 +87,8 @@ proxy:
   # You can also set the memory limit for buffering, which defaults to 1MB, anything
   # larger than that is written to disk.
   buffering:
-    enabled: true
+    requests: true
+    responses: true
     max_request_body: 40_000_000
     max_response_body: 0
     memory: 2_000_000
diff --git a/lib/kamal/configuration/proxy.rb b/lib/kamal/configuration/proxy.rb
index df409d04..ee0321d4 100644
--- a/lib/kamal/configuration/proxy.rb
+++ b/lib/kamal/configuration/proxy.rb
@@ -45,7 +45,8 @@ class Kamal::Configuration::Proxy
       "health-check-timeout": proxy_config.dig("health_check", "timeout"),
       "health-check-path": proxy_config.dig("health_check", "path"),
       "target-timeout": proxy_config["response_timeout"],
-      "buffer": proxy_config.fetch("buffer", { enabled: true }).fetch("enabled", true),
+      "buffer-requests": proxy_config.fetch("buffer", { "requests": true }).fetch("requests", true),
+      "buffer-responses": proxy_config.fetch("buffer", { "responses": true }).fetch("responses", true),
       "buffer-memory": proxy_config.dig("buffer", "memory"),
       "max-request-body": proxy_config.dig("buffer", "max_request_body"),
       "max-response-body": proxy_config.dig("buffer", "max_response_body"),