diff --git a/setup/so-functions b/setup/so-functions
index 24bf8a5aa..5c66d2b75 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1433,6 +1433,10 @@ reinstall_init() {
 
 		# Backup /opt/so since we'll be rebuilding this directory during setup
 		mv /opt/so /opt/so_old
+
+		# Remove container data directories
+		rm -f /nsm/mysql
+
 	} >> $setup_log 2>&1
 }