diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 966d3012..154208ba 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -133,6 +133,7 @@ swarmCleanVolumes(){
         volumes=($(docker-machine ssh ${node} "docker volume ls -q"))
         docker-machine ssh ${node} "docker volume rm ${volumes[@]}"
     done
+	docker volume rm $(docker volume ls -q)
 }
 
 swarmCleanContainers() {
@@ -142,4 +143,5 @@ swarmCleanContainers() {
         containers=($(docker-machine ssh ${node} "docker container ls -aq"))
         docker-machine ssh ${node} "docker container rm ${containers[@]}"
     done
+	docker container rm $(docker container ls -aq)
 }