diff --git a/src/main/groovy/io/seqera/wave/filter/PullMetricsRequestsFilter.groovy b/src/main/groovy/io/seqera/wave/filter/PullMetricsRequestsFilter.groovy
index bb70548ac..07fc817e0 100644
--- a/src/main/groovy/io/seqera/wave/filter/PullMetricsRequestsFilter.groovy
+++ b/src/main/groovy/io/seqera/wave/filter/PullMetricsRequestsFilter.groovy
@@ -68,7 +68,7 @@ class PullMetricsRequestsFilter implements HttpServerFilter {
     private RouteHandler routeHelper
 
     @Inject
-    @Named(TaskExecutors.IO)
+    @Named(TaskExecutors.BLOCKING)
     private ExecutorService executor
 
     @Override
diff --git a/src/main/groovy/io/seqera/wave/http/HttpClientFactory.groovy b/src/main/groovy/io/seqera/wave/http/HttpClientFactory.groovy
index 46c9730d2..f0852219f 100644
--- a/src/main/groovy/io/seqera/wave/http/HttpClientFactory.groovy
+++ b/src/main/groovy/io/seqera/wave/http/HttpClientFactory.groovy
@@ -20,13 +20,12 @@ package io.seqera.wave.http
 
 import java.net.http.HttpClient
 import java.time.Duration
-import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
+import java.util.concurrent.ThreadFactory
 import java.util.concurrent.locks.ReentrantLock
 
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
-import io.seqera.wave.util.CustomThreadFactory
 /**
  * Java HttpClient factory
  *
@@ -36,7 +35,9 @@ import io.seqera.wave.util.CustomThreadFactory
 @CompileStatic
 class HttpClientFactory {
 
-    static private ExecutorService threadPool = Executors.newCachedThreadPool(new CustomThreadFactory("HttpClientThread"))
+    static final private ThreadFactory customThreadFactory = Thread.ofVirtual()
+            .name("httpclient-virtual-thread-", 1)
+            .factory();
 
     static private Duration timeout = Duration.ofSeconds(20)
 
@@ -84,7 +85,7 @@ class HttpClientFactory {
                 .version(HttpClient.Version.HTTP_1_1)
                 .followRedirects(HttpClient.Redirect.NORMAL)
                 .connectTimeout(timeout)
-                .executor(threadPool)
+                .executor(Executors.newThreadPerTaskExecutor(customThreadFactory))
                 .build()
         log.debug "Creating new followRedirectsHttpClient: $result"
         return result
@@ -95,7 +96,7 @@ class HttpClientFactory {
                 .version(HttpClient.Version.HTTP_1_1)
                 .followRedirects(HttpClient.Redirect.NEVER)
                 .connectTimeout(timeout)
-                .executor(threadPool)
+                .executor(Executors.newThreadPerTaskExecutor(customThreadFactory))
                 .build()
         log.debug "Creating new neverRedirectsHttpClient: $result"
         return result
diff --git a/src/main/groovy/io/seqera/wave/service/builder/impl/BuildStateStoreImpl.groovy b/src/main/groovy/io/seqera/wave/service/builder/impl/BuildStateStoreImpl.groovy
index d9562ce43..963629aaa 100644
--- a/src/main/groovy/io/seqera/wave/service/builder/impl/BuildStateStoreImpl.groovy
+++ b/src/main/groovy/io/seqera/wave/service/builder/impl/BuildStateStoreImpl.groovy
@@ -50,7 +50,7 @@ class BuildStateStoreImpl extends AbstractStateStore<BuildEntry> implements Buil
 
     private ExecutorService ioExecutor
 
-    BuildStateStoreImpl(StateProvider<String, String> provider, BuildConfig buildConfig, @Named(TaskExecutors.IO) ExecutorService ioExecutor) {
+    BuildStateStoreImpl(StateProvider<String, String> provider, BuildConfig buildConfig, @Named(TaskExecutors.BLOCKING) ExecutorService ioExecutor) {
         super(provider, new MoshiEncodeStrategy<BuildEntry>() {})
         this.buildConfig = buildConfig
         this.ioExecutor = ioExecutor
diff --git a/src/main/groovy/io/seqera/wave/service/builder/impl/ContainerBuildServiceImpl.groovy b/src/main/groovy/io/seqera/wave/service/builder/impl/ContainerBuildServiceImpl.groovy
index 895a90210..43cf41d72 100644
--- a/src/main/groovy/io/seqera/wave/service/builder/impl/ContainerBuildServiceImpl.groovy
+++ b/src/main/groovy/io/seqera/wave/service/builder/impl/ContainerBuildServiceImpl.groovy
@@ -87,7 +87,7 @@ class ContainerBuildServiceImpl implements ContainerBuildService, JobHandler<Bui
     private BuildStateStore buildStore
 
     @Inject
-    @Named(TaskExecutors.IO)
+    @Named(TaskExecutors.BLOCKING)
     private ExecutorService executor
 
     @Inject
diff --git a/src/main/groovy/io/seqera/wave/service/data/future/AbstractFutureStore.groovy b/src/main/groovy/io/seqera/wave/service/data/future/AbstractFutureStore.groovy
index 130efe56d..f81dd27fa 100644
--- a/src/main/groovy/io/seqera/wave/service/data/future/AbstractFutureStore.groovy
+++ b/src/main/groovy/io/seqera/wave/service/data/future/AbstractFutureStore.groovy
@@ -26,6 +26,7 @@ import java.util.concurrent.TimeoutException
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
 import io.micronaut.context.annotation.Value
+import io.micronaut.scheduling.TaskExecutors
 import io.seqera.wave.encoder.EncodingStrategy
 import jakarta.inject.Inject
 import jakarta.inject.Named
@@ -55,7 +56,7 @@ abstract class AbstractFutureStore<V> implements FutureStore<String,V> {
     private volatile Duration pollInterval
 
     @Inject
-    @Named('future-store-executor')
+    @Named(TaskExecutors.BLOCKING)
     private ExecutorService executor
 
     AbstractFutureStore(FutureHash<String> store, EncodingStrategy<V> encodingStrategy) {
diff --git a/src/main/groovy/io/seqera/wave/service/logs/BuildLogServiceImpl.groovy b/src/main/groovy/io/seqera/wave/service/logs/BuildLogServiceImpl.groovy
index 8be138dd1..2852dbadd 100644
--- a/src/main/groovy/io/seqera/wave/service/logs/BuildLogServiceImpl.groovy
+++ b/src/main/groovy/io/seqera/wave/service/logs/BuildLogServiceImpl.groovy
@@ -79,7 +79,7 @@ class BuildLogServiceImpl implements BuildLogService {
     private String condaLockPrefix
 
     @Inject
-    @Named(TaskExecutors.IO)
+    @Named(TaskExecutors.BLOCKING)
     private volatile ExecutorService ioExecutor
 
     @PostConstruct
diff --git a/src/main/groovy/io/seqera/wave/service/mirror/ContainerMirrorServiceImpl.groovy b/src/main/groovy/io/seqera/wave/service/mirror/ContainerMirrorServiceImpl.groovy
index 1126fe87d..ff4c71938 100644
--- a/src/main/groovy/io/seqera/wave/service/mirror/ContainerMirrorServiceImpl.groovy
+++ b/src/main/groovy/io/seqera/wave/service/mirror/ContainerMirrorServiceImpl.groovy
@@ -54,7 +54,7 @@ class ContainerMirrorServiceImpl implements ContainerMirrorService, JobHandler<M
     private JobService jobService
 
     @Inject
-    @Named(TaskExecutors.IO)
+    @Named(TaskExecutors.BLOCKING)
     private ExecutorService ioExecutor
 
     @Inject
diff --git a/src/main/groovy/io/seqera/wave/service/scan/ContainerScanServiceImpl.groovy b/src/main/groovy/io/seqera/wave/service/scan/ContainerScanServiceImpl.groovy
index d0e3d7511..a4f5cdd28 100644
--- a/src/main/groovy/io/seqera/wave/service/scan/ContainerScanServiceImpl.groovy
+++ b/src/main/groovy/io/seqera/wave/service/scan/ContainerScanServiceImpl.groovy
@@ -64,7 +64,7 @@ class ContainerScanServiceImpl implements ContainerScanService, JobHandler<ScanE
     private ScanConfig config
 
     @Inject
-    @Named(TaskExecutors.IO)
+    @Named(TaskExecutors.BLOCKING)
     private ExecutorService executor
 
     @Inject
diff --git a/src/main/groovy/io/seqera/wave/tower/client/connector/TowerConnector.groovy b/src/main/groovy/io/seqera/wave/tower/client/connector/TowerConnector.groovy
index 27e12d87f..2f9eea9d0 100644
--- a/src/main/groovy/io/seqera/wave/tower/client/connector/TowerConnector.groovy
+++ b/src/main/groovy/io/seqera/wave/tower/client/connector/TowerConnector.groovy
@@ -106,6 +106,10 @@ abstract class TowerConnector {
         return ioExecutor
     }
 
+    protected ExecutorService getIoExecutor() {
+        return ioExecutor
+    }
+
     /**
      * Generic async get with authorization
      * that converts to the provided json model T
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bd030f589..4c7e565b8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -41,9 +41,6 @@ micronaut:
     stream-executor:
       type: FIXED
       number-of-threads: 16
-    future-store-executor:
-      type : FIXED
-      number-of-threads : 32
   netty:
     event-loops:
       stream-pool:
diff --git a/src/test/groovy/io/seqera/wave/service/builder/BuildStoreLocalTest.groovy b/src/test/groovy/io/seqera/wave/service/builder/BuildStoreLocalTest.groovy
index e5190a0a0..68116a60d 100644
--- a/src/test/groovy/io/seqera/wave/service/builder/BuildStoreLocalTest.groovy
+++ b/src/test/groovy/io/seqera/wave/service/builder/BuildStoreLocalTest.groovy
@@ -46,7 +46,7 @@ class BuildStoreLocalTest extends Specification {
     private BuildConfig buildConfig
 
     @Inject
-    @Named(TaskExecutors.IO)
+    @Named(TaskExecutors.BLOCKING)
     ExecutorService ioExecutor
 
     BuildResult zeroResult = BuildResult.create('0')