[Task] #123, cluster configuration and improvements

[Task] #123, cluster configuration and improvements #480