diff --git a/src/main/java/org/gridsuite/modification/server/service/BuildWorkerService.java b/src/main/java/org/gridsuite/modification/server/service/BuildWorkerService.java
index 32da7bcd8..9ac2fbde4 100644
--- a/src/main/java/org/gridsuite/modification/server/service/BuildWorkerService.java
+++ b/src/main/java/org/gridsuite/modification/server/service/BuildWorkerService.java
@@ -110,7 +110,7 @@ private void startBuild(BuildExecContext execContext) {
             BuildInfos buildInfos = execContext.getBuildInfos();
             CompletableFuture<NetworkModificationResult> future = execBuildVariant(execContext, buildInfos);
             NetworkModificationResult result;
-            if (future != null && (result = future.get()) != null) {  // result available
+            if (future != null && (result = future.join()) != null) {  // result available
                 notificationService.emitBuildResultMessage(result, execContext.getReceiver());
                 LOGGER.info("Build complete on node '{}'", execContext.getReceiver());
             } else {  // result not available : stop build request
@@ -120,8 +120,6 @@ private void startBuild(BuildExecContext execContext) {
             }
         } catch (CancellationException e) {
             stoppedPublisherService.publishCancel(execContext.getReceiver(), CANCEL_MESSAGE);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
         } catch (Exception e) {
             throw new BuildException("Node build failed", e);
         } finally {
diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml
index a62711220..9fae09985 100644
--- a/src/main/resources/config/application.yaml
+++ b/src/main/resources/config/application.yaml
@@ -39,8 +39,8 @@ spring:
             consumer:
               auto-bind-dlq: true
               dead-letter-exchange: ${powsybl-ws.rabbitmq.destination.prefix:}build.run.dlx
-              dead-letter-routing-key: "#"
-              dead-letter-queue-name: ${powsybl-ws.rabbitmq.destination.prefix:}build.run.dlq
+              dead-letter-queue-name: ${powsybl-ws.rabbitmq.destination.prefix:}build.run.dlx.dlq
+              dead-letter-exchange-type: topic
               quorum:
                 enabled: true
                 delivery-limit: 2