diff --git a/docker.mk b/docker.mk
index 8135ab0..a719511 100644
--- a/docker.mk
+++ b/docker.mk
@@ -1,7 +1,7 @@
 # Docker
 .PHONY: docker.build docker.test docker.pkg
 
-DOCKER_NETWORK = $(PROJECT_NAME)_network
+DOCKER_NETWORK = $(PROJECT)_network
 
 docker.run: clean
 	@if [ "${env}" == "" ]; then \
@@ -13,15 +13,15 @@ docker.run: clean
 docker.build: clean
 	@echo $(MESSAGE) "Building environment: ${env}"
 	@if [ "${env}" == "" ]; then \
-		docker-compose build --pull --no-cache; \
+		docker-compose build; \
 	else \
-		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml build --pull --no-cache; \
+		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml build; \
 	fi
 
 docker.down: clean
 	@echo $(MESSAGE) "Down Services Environment: ${env}"
 	@if [ "${env}" == "" ]; then \
-		docker-compose -p "${PROJECT_NAME}" down --remove-orphans; \
+		docker-compose -p "${PROJECT}" down --remove-orphans; \
 	else \
 		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml down --remove-orphans; \
 	fi
@@ -29,14 +29,26 @@ docker.down: clean
 docker.ssh: clean
 	docker exec -it $(CONTAINER) bash
 
+docker.status: clean
+	@echo $(MESSAGE) "status Services: ${env}"
+	@if [ "${env}" == "" ]; then \
+		docker-compose -p "${PROJECT}" ps; \
+	else \
+		docker-compose -p "${PROJECT}" -f docker-compose.yml -f docker-compose/"${env}".yml ps; \
+	fi
+
 docker.stop: clean
 	@echo $(MESSAGE) "Stop Services: ${env}"
 	@if [ "${env}" == "" ]; then \
-		docker-compose -p "${PROJECT_NAME}" stop; \
+		docker-compose -p "${PROJECT}" stop; \
 	else \
 		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml stop; \
 	fi
 
+docker.cleanup: clean
+	@echo $(MESSAGE) "Removing dangling docker images...:"
+	docker images -q --filter 'dangling=true' | xargs docker rmi
+
 docker.verify_network: ## Verify network
 	@if [ -z $$(docker network ls | grep $(DOCKER_NETWORK) | awk '{print $$2}') ]; then\
 		(docker network create $(DOCKER_NETWORK));\
@@ -45,7 +57,7 @@ docker.verify_network: ## Verify network
 docker.up: clean
 	@echo $(MESSAGE) "Up Services: ${env}"
 	@if [ "${env}" == "" ]; then \
-		docker-compose -p "${PROJECT_NAME}" up --remove-orphans; \
+		docker-compose -p "${PROJECT}" up --remove-orphans; \
 	else \
 		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml up --remove-orphans; \
 	fi
@@ -53,7 +65,7 @@ docker.up: clean
 docker.list: clean
 	@echo $(MESSAGE) "List Services: ${env}"
 	@if [ "${env}" == "" ]; then \
-		docker-compose -p "${PROJECT_NAME_DEV}" ps; \
+		docker-compose -p "${PROJECT_DEV}" ps; \
 	else \
 		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml ps; \
 	fi