diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile
index 51a545ce77..cb0a7b67a3 100644
--- a/docker/gerrit/base/Dockerfile
+++ b/docker/gerrit/base/Dockerfile
@@ -46,4 +46,4 @@ ENV JAVA_OPTIONS ""
 
 # Ulimits should be set on command line or in docker-compose.yaml
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
-CMD ["/usr/bin/java", ${JAVA_OPTIONS}, "-jar", "/var/gerrit/bin/gerrit.war"]
+CMD ["/usr/local/openjdk-8/bin/java", ${JAVA_OPTIONS}, "-jar", "/var/gerrit/bin/gerrit.war", "daemon", "-d", "/var/gerrit"]