diff --git a/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/ServiceMediator.java b/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/ServiceMediator.java
index bf7be194b..036d8fafa 100644
--- a/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/ServiceMediator.java
+++ b/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/ServiceMediator.java
@@ -39,49 +39,50 @@ public class ServiceMediator {
     private static final Logger log = Logger.getLogger(ServiceMediator.class);
 
     @Inject
-    private TestServiceImpl testService;
+    TestServiceImpl testService;
 
     @Inject
-    private AlertingServiceImpl alertingService;
+    AlertingServiceImpl alertingService;
 
     @Inject
-    private RunServiceImpl runService;
+    RunServiceImpl runService;
 
     @Inject
-    private ReportServiceImpl reportService;
+    ReportServiceImpl reportService;
 
     @Inject
-    private ExperimentServiceImpl experimentService;
+    ExperimentServiceImpl experimentService;
 
     @Inject
-    private LogServiceImpl logService;
+    LogServiceImpl logService;
 
     @Inject
-    private SubscriptionServiceImpl subscriptionService;
+    SubscriptionServiceImpl subscriptionService;
 
     @Inject
-    private ActionServiceImpl actionService;
+    ActionServiceImpl actionService;
 
     @Inject
-    private NotificationServiceImpl notificationService;
+    NotificationServiceImpl notificationService;
 
     @Inject
-    private DatasetServiceImpl datasetService;
+    DatasetServiceImpl datasetService;
 
     @Inject
-    private EventAggregator aggregator;
+    EventAggregator aggregator;
 
     @Inject
     Vertx vertx;
+
     @Inject
-    private SchemaServiceImpl schemaService;
+    SchemaServiceImpl schemaService;
 
     @Inject
     SecurityIdentity identity;
 
     @Inject
     @ConfigProperty(name = "horreum.test-mode", defaultValue = "false")
-    private Boolean testMode;
+    Boolean testMode;
 
     @OnOverflow(value = OnOverflow.Strategy.BUFFER, bufferSize = 10000)
     @Channel("dataset-event-out")
@@ -306,7 +307,7 @@ public <T> BlockingQueue<T> getEventQueue(AsyncEventChannels channel, Integer id
         }
     }
 
-    static class RunUpload {
+    public static class RunUpload {
         public String start;
         public String stop;
         public String test;
diff --git a/horreum-backend/src/main/resources/application.properties b/horreum-backend/src/main/resources/application.properties
index 788dda9f9..9711ee4c7 100644
--- a/horreum-backend/src/main/resources/application.properties
+++ b/horreum-backend/src/main/resources/application.properties
@@ -31,48 +31,56 @@ mp.messaging.incoming.dataset-event-in.address=dataset-event
 mp.messaging.incoming.dataset-event-in.durable=true
 mp.messaging.incoming.dataset-event-in.container-id=horreum-broker
 mp.messaging.incoming.dataset-event-in.link-name=dataset-event
+mp.messaging.incoming.dataset-event-in.failure-strategy=modified-failed
 # dataset-event outgoing
 mp.messaging.outgoing.dataset-event-out.connector=smallrye-amqp
 mp.messaging.outgoing.dataset-event-out.address=dataset-event
 mp.messaging.outgoing.dataset-event-out.durable=true
 mp.messaging.outgoing.dataset-event-out.container-id=horreum-broker
 mp.messaging.outgoing.dataset-event-out.link-name=dataset-event
+mp.messaging.outgoing.dataset-event-out.failure-strategy=modified-failed
 # re-calc incoming
 mp.messaging.incoming.run-recalc-in.connector=smallrye-amqp
 mp.messaging.incoming.run-recalc-in.address=run-recalc
 mp.messaging.incoming.run-recalc-in.durable=true
 mp.messaging.incoming.run-recalc-in.container-id=horreum-broker
 mp.messaging.incoming.run-recalc-in.link-name=run-recalc
+mp.messaging.incoming.run-recalc-in.failure-strategy=modified-failed
 # re-calc outgoing
 mp.messaging.outgoing.run-recalc-out.connector=smallrye-amqp
 mp.messaging.outgoing.run-recalc-out.address=run-recalc
 mp.messaging.outgoing.run-recalc-out.durable=true
 mp.messaging.outgoing.run-recalc-out.container-id=horreum-broker
 mp.messaging.outgoing.run-recalc-out.link-name=run-recalc
+mp.messaging.outgoing.run-recalc-out.failure-strategy=modified-failed
 # schema-sync incoming
 mp.messaging.incoming.schema-sync-in.connector=smallrye-amqp
 mp.messaging.incoming.schema-sync-in.address=schema-sync
 mp.messaging.incoming.schema-sync-in.durable=true
 mp.messaging.incoming.schema-sync-in.container-id=horreum-broker
 mp.messaging.incoming.schema-sync-in.link-name=schema-sync
+mp.messaging.incoming.schema-sync-in.failure-strategy=modified-failed
 # schema-sync outgoing
 mp.messaging.outgoing.schema-sync-out.connector=smallrye-amqp
 mp.messaging.outgoing.schema-sync-out.address=schema-sync
 mp.messaging.outgoing.schema-sync-out.durable=true
 mp.messaging.outgoing.schema-sync-out.container-id=horreum-broker
 mp.messaging.outgoing.schema-sync-out.link-name=schema-sync
+mp.messaging.outgoing.schema-sync-out.failure-strategy=modified-failed
 # run-upload incoming
 mp.messaging.incoming.run-upload-in.connector=smallrye-amqp
 mp.messaging.incoming.run-upload-in.address=run-upload
 mp.messaging.incoming.run-upload-in.durable=true
 mp.messaging.incoming.run-upload-in.container-id=horreum-broker
 mp.messaging.incoming.run-upload-in.link-name=run-upload
+mp.messaging.incoming.run-upload-in.failure-strategy=modified-failed
 # run-upload outgoing
 mp.messaging.outgoing.run-upload-out.connector=smallrye-amqp
 mp.messaging.outgoing.run-upload-out.address=run-upload
 mp.messaging.outgoing.run-upload-out.durable=true
 mp.messaging.outgoing.run-upload-out.container-id=horreum-broker
 mp.messaging.outgoing.run-upload-out.link-name=run-upload
+mp.messaging.outgoing.run-upload-out.failure-strategy=modified-failed
 
 ## Datasource updated by Liquibase - the same as app but always with superuser credentials
 
@@ -234,6 +242,7 @@ quarkus.test.enable-callbacks-for-integration-tests=true
 horreum.dev-services.enabled=true
 #horreum.dev-services.postgres.ssl-enabled=true
 #horreum.dev-services.keycloak.https-enabled=true
+quarkus.amqp.devservices.enabled=true
 
 ## We don't want quarkus to start a database/keycloak for us in dev mode, we are doing that
 quarkus.datasource.devservices.enabled=false