diff --git a/puppet/files/rsyslog-swift.conf b/puppet/files/rsyslog-swift.conf
index b986691dbef1166148d9e4a4601eab1d66771b62..d58fbf8d4e60cbc7594d3f874c16caae83d8e03a 100644
--- a/puppet/files/rsyslog-swift.conf
+++ b/puppet/files/rsyslog-swift.conf
@@ -6,6 +6,10 @@
 #$template HourlyProxyLog,"/var/log/swift/hourly/%$YEAR%%$MONTH%%$DAY%%$HOUR%"
 #local0.* ?HourlyProxyLog
 
+# Haproxy specific
+if $programname contains 'haproxy' then /var/log/haproxy.log
+if $programname contains 'haproxy' then stop
+
 # Use the following to have separate log files for each of the main servers:
 # account-server, container-server, object-server, proxy-server. Note:
 # object-updater's output will be stored in object.log.
diff --git a/puppet/manifests/compute.pp b/puppet/manifests/compute.pp
index db3fb50408ae685c7cfb21e161c6faed72602725..d714a96a26b1a7096751bd14883089c760969613 100644
--- a/puppet/manifests/compute.pp
+++ b/puppet/manifests/compute.pp
@@ -109,6 +109,7 @@ class oci::compute(
 
   class { 'haproxy':
     global_options   => {
+      'log'     => '/dev/log local0',
       'maxconn' => '256',
       'user'    => 'haproxy',
       'group'   => 'haproxy',
diff --git a/puppet/manifests/controller.pp b/puppet/manifests/controller.pp
index ec9a88a5f7cf40bfccf189db2655ca2e0421d2d4..27857852ab94208818f6d6779a113502ca23d091 100644
--- a/puppet/manifests/controller.pp
+++ b/puppet/manifests/controller.pp
@@ -530,6 +530,7 @@ export OS_CACERT=${$api_endpoint_ca_file}
   }->
   class { 'haproxy':
     global_options   => {
+      'log'     => '/dev/log local0',
       'maxconn' => '40960',
       'user'    => 'haproxy',
       'group'   => 'haproxy',
diff --git a/puppet/manifests/swiftproxy.pp b/puppet/manifests/swiftproxy.pp
index 6712af7da39f89f5dbfc7fecdb07bc00a38db784..ffe652c7c2d500ac75bcdce0379d0f430bc12df2 100644
--- a/puppet/manifests/swiftproxy.pp
+++ b/puppet/manifests/swiftproxy.pp
@@ -130,6 +130,7 @@ class oci::swiftproxy(
 
     class { 'haproxy':
       global_options   => {
+        'log'     => '/dev/log local0',
         'maxconn' => '40960',
         'user'    => 'haproxy',
         'group'   => 'haproxy',
@@ -143,6 +144,15 @@ class oci::swiftproxy(
       defaults_options => {
         'mode'    => 'http',
         'maxconn' => '40960',
+        'timeout' => [
+          'http-request 10s',
+          'queue 1m',
+          'connect 10s',
+          'client 1m',
+          'server 1m',
+          'check 10s',
+        ],
+        'stats'     => 'enable',
       },
       merge_options => true,
     }->