diff --git a/build-docker.sh b/build-docker.sh
index 933f9c1..48df922 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -13,8 +13,16 @@ fi
 echo "Starting build..."
 cp $1 ./prosody.deb
 docker build -t prosody/prosody:$2 .
+for i in "${@:3}"; do
+  echo "Also building tag $i"
+  docker build -t prosody/prosody:$i .
+done
 docker push prosody/prosody
 
 echo "Cleaning up..."
 docker rmi prosody/prosody:$2
-rm ./prosody.deb
\ No newline at end of file
+for i in "${@:3}"; do
+  echo "Also cleaning tag $i"  
+  docker rmi prosody/prosody:$i
+done
+rm ./prosody.deb