diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CanaryJudgeTask.java b/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CanaryJudgeTask.java
index 40b9787dc..060333a85 100644
--- a/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CanaryJudgeTask.java
+++ b/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CanaryJudgeTask.java
@@ -36,6 +36,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 @Slf4j
@@ -48,6 +49,7 @@ public class CanaryJudgeTask implements RetryableTask {
   private final ObjectMapper objectMapper;
   private final ExecutionMapper executionMapper;
 
+  @Lazy
   @Autowired
   public CanaryJudgeTask(
       AccountCredentialsRepository accountCredentialsRepository,
diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CompareJudgeResultsTask.java b/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CompareJudgeResultsTask.java
index 96fb4badf..cbb6af0e0 100644
--- a/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CompareJudgeResultsTask.java
+++ b/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CompareJudgeResultsTask.java
@@ -33,6 +33,7 @@
 import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 @Slf4j
@@ -45,6 +46,7 @@ public class CompareJudgeResultsTask implements RetryableTask {
   private final ObjectMapper objectMapper;
   private final ExecutionMapper executionMapper;
 
+  @Lazy
   @Autowired
   public CompareJudgeResultsTask(
       AccountCredentialsRepository accountCredentialsRepository,
diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/metrics/orca/MetricSetMixerServiceTask.java b/kayenta-core/src/main/java/com/netflix/kayenta/metrics/orca/MetricSetMixerServiceTask.java
index 33dfffc43..0a9a77e0d 100644
--- a/kayenta-core/src/main/java/com/netflix/kayenta/metrics/orca/MetricSetMixerServiceTask.java
+++ b/kayenta-core/src/main/java/com/netflix/kayenta/metrics/orca/MetricSetMixerServiceTask.java
@@ -37,6 +37,7 @@
 import javax.annotation.Nonnull;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -47,6 +48,7 @@ public class MetricSetMixerServiceTask implements RetryableTask {
   private final MetricSetMixerService metricSetMixerService;
   private final ExecutionMapper executionMapper;
 
+  @Lazy
   @Autowired
   public MetricSetMixerServiceTask(
       AccountCredentialsRepository accountCredentialsRepository,
diff --git a/kayenta-standalone-canary-analysis/src/main/java/com/netflix/kayenta/standalonecanaryanalysis/orca/task/MonitorCanaryTask.java b/kayenta-standalone-canary-analysis/src/main/java/com/netflix/kayenta/standalonecanaryanalysis/orca/task/MonitorCanaryTask.java
index 9372a143c..f0525c9e1 100644
--- a/kayenta-standalone-canary-analysis/src/main/java/com/netflix/kayenta/standalonecanaryanalysis/orca/task/MonitorCanaryTask.java
+++ b/kayenta-standalone-canary-analysis/src/main/java/com/netflix/kayenta/standalonecanaryanalysis/orca/task/MonitorCanaryTask.java
@@ -48,6 +48,7 @@
 import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -68,6 +69,7 @@ public class MonitorCanaryTask implements Task, OverridableTimeoutRetryableTask
   private final AccountCredentialsRepository accountCredentialsRepository;
   private final ExecutionMapper executionMapper;
 
+  @Lazy
   @Autowired
   public MonitorCanaryTask(
       ExecutionRepository executionRepository,
diff --git a/kayenta-standalone-canary-analysis/src/main/java/com/netflix/kayenta/standalonecanaryanalysis/orca/task/RunCanaryTask.java b/kayenta-standalone-canary-analysis/src/main/java/com/netflix/kayenta/standalonecanaryanalysis/orca/task/RunCanaryTask.java
index 2238f08f1..9ff9931b9 100644
--- a/kayenta-standalone-canary-analysis/src/main/java/com/netflix/kayenta/standalonecanaryanalysis/orca/task/RunCanaryTask.java
+++ b/kayenta-standalone-canary-analysis/src/main/java/com/netflix/kayenta/standalonecanaryanalysis/orca/task/RunCanaryTask.java
@@ -34,6 +34,7 @@
 import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /** Orca Task that tells Kayenta to execute a canary analysis / judgement */
@@ -47,6 +48,7 @@ public class RunCanaryTask implements Task {
   private final ExecutionMapper executionMapper;
   private final ObjectMapper kayentaObjectMapper;
 
+  @Lazy
   @Autowired
   public RunCanaryTask(
       AccountCredentialsRepository accountCredentialsRepository,