diff --git a/dokku b/dokku
index 64890bcf5..d0f994cc1 100755
--- a/dokku
+++ b/dokku
@@ -12,6 +12,10 @@ case "$1" in
     echo "-----> Release complete!"
     echo "-----> Deploying $APP ..."
     dokku deploy $APP $IMAGE
+    echo "-----> Deploy complete!"
+    echo "-----> Cleaning up ..."
+    dokku cleanup
+    echo "-----> Cleanup complete!"
     echo "=====> Application deployed:"
     echo "       $(dokku url $APP)"
     echo
@@ -58,6 +62,13 @@ case "$1" in
     pluginhook post-deploy $APP $port
     ;;
 
+  cleanup)
+    # delete all non-running container
+    docker ps -a | grep 'Exit' |  awk '{print $1}' | xargs docker rm 2> /dev/null &
+    # delete unused images
+    docker images | grep '<none>' |  awk '{print $3}'  | xargs docker rmi 2> /dev/null &
+    ;;
+
   plugins)
     ls -1 -d $PLUGIN_PATH/*/
     ;;