diff --git a/Makefile b/Makefile
index c804ff43bf..ff6f75b900 100644
--- a/Makefile
+++ b/Makefile
@@ -668,11 +668,12 @@ docker-compose-isolated-build: awx-devel-build
 	docker tag ansible/awx_isolated $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG)
 	#docker push $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG)
 
-MACHINE?=default
 docker-clean:
-	eval $$(docker-machine env $(MACHINE))
 	$(foreach container_id,$(shell docker ps -f name=tools_awx -aq),docker stop $(container_id); docker rm -f $(container_id);)
-	-docker images | grep "awx_devel" | awk '{print $$1 ":" $$2}' | xargs docker rmi
+	docker images | grep "awx_devel" | awk '{print $$1 ":" $$2}' | xargs docker rmi
+
+docker-clean-volumes:
+	docker volume rm tools_awx_db
 
 docker-refresh: docker-clean docker-compose
 
diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
index f81307a858..7a0ee8ea67 100644
--- a/tools/docker-compose.yml
+++ b/tools/docker-compose.yml
@@ -50,6 +50,8 @@ services:
       - "5432:5432"
     environment:
       POSTGRES_HOST_AUTH_METHOD: trust
+    volumes:
+      - "awx_db:/var/lib/postgresql/data"
   memcached:
     user: ${CURRENT_UID}
     image: memcached:alpine
@@ -67,3 +69,6 @@ services:
       - "./redis/redis.conf:/usr/local/etc/redis/redis.conf"
       - "./redis/redis_socket_standalone:/var/run/redis/"
     command: ["/usr/local/etc/redis/redis.conf"]
+
+volumes:
+  awx_db: