diff --git a/glicid/services/cuirass.scm b/glicid/services/cuirass.scm
index 3217a4f..b557e94 100644
--- a/glicid/services/cuirass.scm
+++ b/glicid/services/cuirass.scm
@@ -27,7 +27,8 @@
                           cuirass-remote-worker-configuration?
                           cuirass-remote-worker-service-type))
 
-(define %cuirass-default-database "dbname=cuirass")
+(define %cuirass-default-database
+  "dbname=cuirass")
 
 (define-record-type* <cuirass-remote-server-configuration>
                      cuirass-remote-server-configuration make-cuirass-remote-server-configuration
@@ -91,15 +92,14 @@
                      (http-proxy cuirass-configuration-http-proxy ;string
                                  (default ""))
                      (https-proxy cuirass-configuration-https-proxy ;string
-                                  (default ""))
-                     )
+                                  (default "")))
 
 (define (cuirass-shepherd-service config)
   "Return a <shepherd-service> for the Cuirass service with CONFIG."
   (let ((cuirass (cuirass-configuration-cuirass config))
         (cache-directory (cuirass-configuration-cache-directory config))
         (web-log-file (cuirass-configuration-web-log-file config))
-        (log-file (cuirass-configuration-log-file config))
+        (main-log-file (cuirass-configuration-log-file config))
         (user (cuirass-configuration-user config))
         (group (cuirass-configuration-group config))
         (interval (cuirass-configuration-interval config))
@@ -112,9 +112,7 @@
         (use-substitutes? (cuirass-configuration-use-substitutes? config))
         (one-shot? (cuirass-configuration-one-shot? config))
         (fallback? (cuirass-configuration-fallback? config))
-        (extra-options (cuirass-configuration-extra-options config))
-        (http-proxy (cuirass-configuration-http-proxy config))
-        (https-proxy (cuirass-configuration-https-proxy config)))
+        (extra-options (cuirass-configuration-extra-options config)))
     `(,(shepherd-service
          (documentation "Run Cuirass.")
          (provision '(cuirass))
@@ -139,18 +137,14 @@
                           #$@extra-options)
 
                     #:environment-variables
-                    (list
-                      "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
-                      (string-append "GIT_EXEC_PATH=" #$git "/libexec/git-core")
-                      (string-append "http_proxy=" #$http-proxy)
-                      (string-append "https_proxy=" #$http-proxy)
-                      ;"http_proxy=http://proxy-upgrade.univ-nantes.prive:3128/"
-                      ;"https_proxy=http://proxy-upgrade.univ-nantes.prive:3128/"
-                      )
+                    (list "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
+                          (string-append "GIT_EXEC_PATH=" #$git "/libexec/git-core")
+                          (string-append "http_proxy=" #$http-proxy)
+                          (string-append "https_proxy=" #$http-proxy))
 
                     #:user #$user
                     #:group #$group
-                    #:log-file #$log-file))
+                    #:log-file #$main-log-file))
          (stop #~(make-kill-destructor)))
        ,(shepherd-service
           (documentation "Run Cuirass web interface.")
@@ -223,12 +217,10 @@
                                                                     private-key))
                                                    '()))
                                         #:environment-variables
-                                        (list
-                                          "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
-                                          (string-append "GIT_EXEC_PATH=" #$git "/libexec/git-core")
-                                          (string-append "http_proxy=" #$http-proxy)
-                                          (string-append "https_proxy=" #$http-proxy)
-                                          )
+                                        (list "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
+                                              (string-append "GIT_EXEC_PATH=" #$git "/libexec/git-core")
+                                              (string-append "http_proxy=" #$http-proxy)
+                                              (string-append "https_proxy=" #$http-proxy))
                                         #:log-file #$log-file))
                              (stop #~(make-kill-destructor)))))
            '()))))
@@ -293,7 +285,8 @@
           (files (list (cuirass-configuration-log-file config)
                        (cuirass-configuration-web-log-file config)))
           (frequency 'weekly)
-          (options '("rotate 40"))))) ;worth keeping
+          (options `("rotate 40" ;worth keeping
+                     ,@%default-log-rotation-options)))))
 
 (define cuirass-service-type
   (service-type
@@ -379,19 +372,19 @@
                                                                private-key))
                                               '()))
                                    #:environment-variables
-                                   (list
-                                     "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
-                                     (string-append "GIT_EXEC_PATH=" #$git "/libexec/git-core")
-                                     (string-append "http_proxy=" #$http-proxy)
-                                     (string-append "https_proxy=" #$http-proxy)
-                                     )
+                                   (list "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
+                                         (string-append "GIT_EXEC_PATH=" #$git "/libexec/git-core")
+                                         (string-append "http_proxy=" #$http-proxy)
+                                         (string-append "https_proxy=" #$http-proxy))
                                    #:log-file #$log-file))
                         (stop #~(make-kill-destructor))))))
 
 (define cuirass-remote-worker-service-type
   (service-type
     (name 'cuirass-remote-worker)
-    (extensions (list
-                  (service-extension shepherd-root-service-type
-                                     cuirass-remote-worker-shepherd-service)))
-    (description "Run the Cuirass remote build worker service.")))
+    (extensions
+      (list
+        (service-extension shepherd-root-service-type
+                           cuirass-remote-worker-shepherd-service)))
+    (description
+      "Run the Cuirass remote build worker service.")))