diff --git a/guix-data-service/web/build-server/controller.scm b/guix-data-service/web/build-server/controller.scm
index df3f3d7..e759fc8 100644
--- a/guix-data-service/web/build-server/controller.scm
+++ b/guix-data-service/web/build-server/controller.scm
@@ -326,7 +326,7 @@
   (match method-and-path-components
     (('GET "build-servers")
      (let ((build-servers
-            (with-resource-from-pool (connection-pool) conn
+            (call-with-resource-from-pool (connection-pool)
               select-build-servers)))
        (render-build-servers mime-types
                              build-servers)))
diff --git a/guix-data-service/web/build/controller.scm b/guix-data-service/web/build/controller.scm
index 44b3380..bf77e03 100644
--- a/guix-data-service/web/build/controller.scm
+++ b/guix-data-service/web/build/controller.scm
@@ -42,8 +42,8 @@
 (define parse-build-server
   (lambda (v)
     (letpar& ((build-servers
-               (with-resource-from-pool (connection-pool) conn
-                select-build-servers)))
+               (call-with-resource-from-pool (connection-pool)
+                 select-build-servers)))
       (or (any (match-lambda
                  ((id url lookup-all-derivations? lookup-builds?)
                   (if (eq? (string->number v)
diff --git a/guix-data-service/web/revision/controller.scm b/guix-data-service/web/revision/controller.scm
index 938f55c..d4b741f 100644
--- a/guix-data-service/web/revision/controller.scm
+++ b/guix-data-service/web/revision/controller.scm
@@ -85,7 +85,8 @@
 
 (define (parse-build-server v)
   (letpar& ((build-servers
-             (with-resource-from-pool (connection-pool) conn select-build-servers)))
+             (call-with-resource-from-pool (connection-pool)
+               select-build-servers)))
     (or (any (match-lambda
                ((id url lookup-all-derivations? lookup-builds?)
                 (if (eq? (string->number v)