diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java b/indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java
index a0ebfa98dce..b46867b0414 100644
--- a/indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java
+++ b/indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java
@@ -29,6 +29,7 @@ import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.inject.Injector;
 import com.metamx.common.logger.Logger;
 import io.druid.common.utils.JodaUtils;
 import io.druid.guice.ExtensionsConfig;
@@ -38,6 +39,7 @@ import io.druid.indexer.HadoopDruidIndexerConfig;
 import io.druid.indexer.HadoopDruidIndexerJob;
 import io.druid.indexer.HadoopIngestionSpec;
 import io.druid.indexer.Jobby;
+import io.druid.indexer.MetadataStorageUpdaterJobHandler;
 import io.druid.indexing.common.TaskLock;
 import io.druid.indexing.common.TaskStatus;
 import io.druid.indexing.common.TaskToolbox;
@@ -63,8 +65,9 @@ public class HadoopIndexTask extends AbstractTask
   private static final Logger log = new Logger(HadoopIndexTask.class);
   private static final ExtensionsConfig extensionsConfig;
 
+  final static Injector injector = GuiceInjectors.makeStartupInjector();
   static {
-    extensionsConfig = GuiceInjectors.makeStartupInjector().getInstance(ExtensionsConfig.class);
+    extensionsConfig = injector.getInstance(ExtensionsConfig.class);
   }
 
   private static String getTheDataSource(HadoopIngestionSpec spec, HadoopIngestionSpec config)
@@ -288,7 +291,10 @@ public class HadoopIndexTask extends AbstractTask
               .withTuningConfig(theSchema.getTuningConfig().withVersion(version))
       );
 
-      HadoopDruidIndexerJob job = new HadoopDruidIndexerJob(config);
+      HadoopDruidIndexerJob job = new HadoopDruidIndexerJob(
+          config,
+          injector.getInstance(MetadataStorageUpdaterJobHandler.class)
+      );
 
       log.info("Starting a hadoop index generator job...");
       if (job.run()) {
diff --git a/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java b/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java
index 007b56fc076..6cb3f6c845a 100644
--- a/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java
+++ b/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java
@@ -21,15 +21,18 @@ package io.druid.cli;
 
 import com.google.api.client.repackaged.com.google.common.base.Throwables;
 import com.google.api.client.util.Lists;
+import com.google.inject.Injector;
 import com.metamx.common.logger.Logger;
 import io.airlift.command.Arguments;
 import io.airlift.command.Command;
+import io.druid.guice.GuiceInjectors;
 import io.druid.indexer.HadoopDruidDetermineConfigurationJob;
 import io.druid.indexer.HadoopDruidIndexerConfig;
 import io.druid.indexer.HadoopDruidIndexerJob;
 import io.druid.indexer.HadoopIngestionSpec;
 import io.druid.indexer.JobHelper;
 import io.druid.indexer.Jobby;
+import io.druid.indexer.MetadataStorageUpdaterJobHandler;
 
 import java.io.File;
 import java.util.List;
@@ -46,6 +49,8 @@ public class CliInternalHadoopIndexer implements Runnable
   @Arguments(description = "A JSON object or the path to a file that contains a JSON object", required = true)
   private String argumentSpec;
 
+  private final Injector injector = GuiceInjectors.makeStartupInjector();
+
   @Override
   public void run()
   {
@@ -53,7 +58,7 @@ public class CliInternalHadoopIndexer implements Runnable
       HadoopDruidIndexerConfig config = getHadoopDruidIndexerConfig();
       List<Jobby> jobs = Lists.newArrayList();
       jobs.add(new HadoopDruidDetermineConfigurationJob(config));
-      jobs.add(new HadoopDruidIndexerJob(config));
+      jobs.add(new HadoopDruidIndexerJob(config, injector.getInstance(MetadataStorageUpdaterJobHandler.class)));
       JobHelper.runJobs(jobs, config);
 
     }
@@ -65,7 +70,6 @@ public class CliInternalHadoopIndexer implements Runnable
   public HadoopDruidIndexerConfig getHadoopDruidIndexerConfig()
   {
     try {
-      HadoopIngestionSpec spec;
       if (argumentSpec.startsWith("{")) {
         return HadoopDruidIndexerConfig.fromString(argumentSpec);
       } else {