diff --git a/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticDashboardSetup.scala b/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticDashboardSetup.scala
index 13b1120..fd038be 100644
--- a/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticDashboardSetup.scala
+++ b/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticDashboardSetup.scala
@@ -56,10 +56,11 @@
        |version: '3'
        |services:
        |
-       |  spark-gerrit-analytics-etl:
+       |  gerrit-analytics-etl-gitcommits:
        |    extra_hosts:
        |      - gerrit:${gerritLocalUrl.getHost}
-       |    image: gerritforge/spark-gerrit-analytics-etl:latest
+       |    image: gerritforge/gerrit-analytics-etl-gitcommits:latest
+       |    container_name: gerrit-analytics-etl-gitcommits
        |    environment:
        |      - ES_HOST=elasticsearch
        |      - GERRIT_URL=${gerritLocalUrl.getProtocol}://gerrit:${gerritLocalUrl.getPort}
diff --git a/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticsWizardActions.scala b/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticsWizardActions.scala
index a364bb3..e545925 100644
--- a/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticsWizardActions.scala
+++ b/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticsWizardActions.scala
@@ -101,7 +101,7 @@
                                         val dockerClientProvider: DockerClientProvider)
     extends RestReadView[ProjectResource] {
   override def apply(resource: ProjectResource): Response[String] = {
-    val containerName = "analytics-wizard_spark-gerrit-analytics-etl_1"
+    val containerName = "gerrit-analytics-etl-gitcommits"
     responseFromContainerInfo(dockerClientProvider.client.inspectContainer(containerName))
   }
   private def responseFromContainerInfo(containerInfo: ContainerInfo) = {