diff --git a/Makefile b/Makefile
index 5052705..6088609 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,13 @@ rundev:
 	@echo "------------------------------------------------------------------"
 	@docker-compose -p $(PROJECT_ID) up
 
+stop:
+	@echo
+	@echo "------------------------------------------------------------------"
+	@echo "Stopping in production mode"
+	@echo "------------------------------------------------------------------"
+	@docker-compose -p $(PROJECT_ID) stop
+
 kill:
 	@echo
 	@echo "------------------------------------------------------------------"
@@ -41,11 +48,11 @@ ipdb:
 	@echo "------------------------------------------------------------------"
 	@echo "Database's IP"
 	@echo "------------------------------------------------------------------"
-	@docker inspect $(PROJECT_ID)_db_1 | grep '"IPAddress"' | head -1 | cut -d '"' -f 4
+	@docker inspect $(PROJECT_ID)_db | grep '"IPAddress"' | head -1 | cut -d '"' -f 4
 
 timestamp:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Timestamp"
 	@echo "------------------------------------------------------------------"
-	@docker exec -t -i $(PROJECT_ID)_imposm_1 cat /home/settings/timestamp.txt
+	@docker exec -t -i $(PROJECT_ID)_imposm cat /home/settings/timestamp.txt
diff --git a/docker-compose.yml b/docker-compose.yml
index 38d9037..230b6b5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,6 @@
 storage:
   image: ubuntu:latest
+  container_name: dockerosm_storage
   hostname: storage
   volumes:
     # These are sharable to other containers
@@ -14,14 +15,15 @@ storage:
 db:
   # About the postgresql version, it should match in the dockerfile of docker-imposm3
   image: kartoza/postgis:9.4-2.1
+  container_name: dockerosm_db
   hostname: db
   environment:
     - USERNAME=docker
     - PASS=docker
 
 imposm:
-  #image: kartoza/imposm
   build: docker-imposm3
+  container_name: dockerosm_imposm
   volumes_from:
     - storage
   links:
@@ -58,6 +60,7 @@ imposm:
 
 osmupdate:
   build: docker-osmupdate
+  container_name: dockerosm_osmupdate
   volumes_from:
     - storage
   environment: