diff --git a/Makefile b/Makefile
index d81266352f..9afc7c7440 100644
--- a/Makefile
+++ b/Makefile
@@ -561,7 +561,7 @@ docker-compose-build:
 
 docker-clean:
 	-$(foreach container_id,$(shell docker ps -f name=tools_awx -aq && docker ps -f name=tools_receptor -aq),docker stop $(container_id); docker rm -f $(container_id);)
-	-$(foreach image_id,$(shell docker images --filter=reference='*awx_devel*' -aq),docker rmi --force $(image_id);)
+	-$(foreach image_id,$(shell docker images --filter=reference='*/*/*awx_devel*' --filter=reference='*/*awx_devel*' --filter=reference='*awx_devel*' -aq),docker rmi --force $(image_id);)
 
 docker-clean-volumes: docker-compose-clean docker-compose-container-group-clean
 	docker volume rm -f tools_awx_db tools_grafana_storage tools_prometheus_storage $(docker volume ls --filter name=tools_redis_socket_ -q)
@@ -680,4 +680,3 @@ help/generate:
 ## Display help for ui-next targets
 help/ui-next:
 	@make -s help MAKEFILE_LIST="awx/ui_next/Makefile"
-