diff --git a/Dockerfile b/Dockerfile
index 6d981f8..330a064 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,4 +21,4 @@ COPY . /opt/eventman/
 
 WORKDIR /opt/eventman/
 ENTRYPOINT ["./eventman_server.py"]
-CMD ["--debug", "--mongo_url=mongodb://eventman-mongo"]
+CMD ["--debug", "--mongo_url=mongodb://mongo"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 8f4ab2d..404b500 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,6 @@ services:
     ports:
      - "5242:5242"
     depends_on:
-     - eventman-mongo
-  eventman-mongo:
+     - mongo
+  mongo:
     image: "mongo:latest"
diff --git a/docker-tools/mongodump/run.sh b/docker-tools/mongodump/run.sh
index cd2ceb6..de039da 100755
--- a/docker-tools/mongodump/run.sh
+++ b/docker-tools/mongodump/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-mongodump --host eventman-mongo --out /tmp/ --db eventman
+mongodump --host mongo --out /tmp/ --db eventman
 cd /tmp
 tar cfz /data/eventman-dump-`date +'%Y-%m-%dT%H.%M.%S'`.tgz eventman