diff --git a/fighter/scripts/startup.sh b/fighter/scripts/startup.sh
index 8e7a466..5f75cb4 100644
--- a/fighter/scripts/startup.sh
+++ b/fighter/scripts/startup.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 #set -x # debugging flag
 
+# Clean up any remnants from unclean shutdown
+docker stop $(docker ps -q) # shut down running containers
+docker rm $(docker ps -aq) # remove all containers
+
 # Check for network mounted devices
 # NAS SMB
 if ! mount -t cifs | grep -q '/mnt/nas'; then