Deploy time clustering

/to @Schoonology