diff --git a/lib/workload_service/application.ex b/lib/workload_service/application.ex
index 687999a..f19090e 100644
--- a/lib/workload_service/application.ex
+++ b/lib/workload_service/application.ex
@@ -8,6 +8,7 @@ defmodule WorkloadService.Application do
     children = [
       WorkloadService.CommandedApp,
       WorkloadService.Consumers.QuoteRequestedConsumer,
+      WorkloadService.Handlers.TaskCompletedHandler,
       # WorkloadService.Consumers.SolicitationRequestedConsumer,
       WorkloadService.Projectors.TaskProjector,
       WorkloadService.Repo,
diff --git a/lib/workload_service/consumers/quote_requested_consumer.ex b/lib/workload_service/consumers/quote_requested_consumer.ex
index 535e359..2c37d78 100644
--- a/lib/workload_service/consumers/quote_requested_consumer.ex
+++ b/lib/workload_service/consumers/quote_requested_consumer.ex
@@ -6,7 +6,7 @@ defmodule WorkloadService.Consumers.QuoteRequestedConsumer do
   alias WorkloadService.Commands.QuoteTask
 
   @exchange "policy_service.events.quote_requested"
-  @queue "policy_service.quote_requested"
+  @queue "workload_service.quote_requested"
   @routing_key "quote.requested"
 
   def start_link(opts \\ []) do
diff --git a/lib/workload_service/handlers/task_completed_handler.ex b/lib/workload_service/handlers/task_completed_handler.ex
index af1f501..84fb2aa 100644
--- a/lib/workload_service/handlers/task_completed_handler.ex
+++ b/lib/workload_service/handlers/task_completed_handler.ex
@@ -34,7 +34,7 @@ defmodule WorkloadService.Handlers.TaskCompletedHandler do
         state ->
           MessageBus.publish(
             "workload_service.events.quote_task_completed",
-            "quote_task_completed",
+            "quote_task.completed",
             state
           )