diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index c4574dd..dcf9d75 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -1525,6 +1525,8 @@ WHERE builder != 'builtin:download'
 (define* (compute-and-fix-broken-derivations-in-revision
           git-repository-id commit
           #:key
+          systems
+          targets
           (ignore-systems '())
           (ignore-targets '())
           (extra-inferior-environment-variables '())
@@ -1681,11 +1683,19 @@ WHERE builder != 'builtin:download'
                      (compute-derivations system target)))
                   (list
                    (let ((all-system-target-pairs
-                          (call-with-inferior
-                           inf-and-store-pool
-                           (lambda (inferior inferior-store)
-                             (inferior-fetch-system-target-pairs inferior))
-                           #:memory-limit inferior-memory-limit)))
+                          (if (or systems targets)
+                              (append
+                               (map (lambda (system)
+                                      (cons system #f))
+                                    (or systems '()))
+                               (map (lambda (target)
+                                      (cons "x86_64-linux" target))
+                                    (or targets '())))
+                              (call-with-inferior
+                               inf-and-store-pool
+                               (lambda (inferior inferior-store)
+                                 (inferior-fetch-system-target-pairs inferior))
+                               #:memory-limit inferior-memory-limit))))
                      (filter
                       (match-lambda
                         ((system . target)