diff --git a/core/src/main/java/org/jboss/pnc/build/finder/core/BuildFinder.java b/core/src/main/java/org/jboss/pnc/build/finder/core/BuildFinder.java
index d644f0f8..1da4c22a 100644
--- a/core/src/main/java/org/jboss/pnc/build/finder/core/BuildFinder.java
+++ b/core/src/main/java/org/jboss/pnc/build/finder/core/BuildFinder.java
@@ -38,10 +38,12 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -70,7 +72,8 @@
 import com.redhat.red.build.koji.model.xmlrpc.KojiTagInfo;
 import com.redhat.red.build.koji.model.xmlrpc.KojiTaskInfo;
 
-public class BuildFinder implements Callable<Map<BuildSystemInteger, KojiBuild>> {
+public class BuildFinder
+        implements Callable<Map<BuildSystemInteger, KojiBuild>>, Supplier<Map<BuildSystemInteger, KojiBuild>> {
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildFinder.class);
 
     private static final String BUILDS_FILENAME = "builds.json";
@@ -1203,6 +1206,23 @@ public Map<BuildSystemInteger, KojiBuild> call() throws KojiClientException {
         return allBuilds;
     }
 
+    /**
+     * Provide a Supplier version of the Callable. This is useful when using the BuildFinder to obtain a
+     * CompletableFuture (via {@link java.util.concurrent.CompletableFuture#supplyAsync(Supplier)})
+     *
+     * throws CompletionException if a KojiClientException is thrown
+     *
+     * @return For each checksum type (key), the checksum values of the files
+     */
+    @Override
+    public Map<BuildSystemInteger, KojiBuild> get() {
+        try {
+            return call();
+        } catch (KojiClientException e) {
+            throw new CompletionException(e);
+        }
+    }
+
     public void setListener(BuildFinderListener listener) {
         this.listener = listener;
 
diff --git a/core/src/main/java/org/jboss/pnc/build/finder/core/DistributionAnalyzer.java b/core/src/main/java/org/jboss/pnc/build/finder/core/DistributionAnalyzer.java
index 3e2ebaa5..786fe6de 100644
--- a/core/src/main/java/org/jboss/pnc/build/finder/core/DistributionAnalyzer.java
+++ b/core/src/main/java/org/jboss/pnc/build/finder/core/DistributionAnalyzer.java
@@ -39,12 +39,14 @@
 import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -64,7 +66,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class DistributionAnalyzer implements Callable<Map<ChecksumType, MultiValuedMap<String, LocalFile>>> {
+public class DistributionAnalyzer implements Callable<Map<ChecksumType, MultiValuedMap<String, LocalFile>>>,
+        Supplier<Map<ChecksumType, MultiValuedMap<String, LocalFile>>> {
     private static final Logger LOGGER = LoggerFactory.getLogger(DistributionAnalyzer.class);
 
     /**
@@ -574,6 +577,23 @@ public Map<ChecksumType, MultiValuedMap<String, LocalFile>> call() throws IOExce
         return Collections.unmodifiableMap(map);
     }
 
+    /**
+     * Provide a Supplier version of the Callable. This is useful when using the DistributionAnalyzer to obtain a
+     * CompletableFuture (via {@link java.util.concurrent.CompletableFuture#supplyAsync(Supplier)})
+     *
+     * throws CompletionException if an IO exception is thrown
+     *
+     * @return For each checksum type (key), the checksum values of the files
+     */
+    @Override
+    public Map<ChecksumType, MultiValuedMap<String, LocalFile>> get() {
+        try {
+            return call();
+        } catch (IOException e) {
+            throw new CompletionException(e);
+        }
+    }
+
     public BlockingQueue<Checksum> getQueue() {
         return queue;
     }