A method and system manages revisions of software code for one or more servers in an infrastructure. An indication of the version of the code currently residing with one of the servers is transmitted to the infrastructure. An indication of the version of the code currently residing with the infrastructure for the server's type is also transmitted to the one of the servers. A determination is made as to whether the server's version should be updated to the infrastructure's, whether the infrastructure's version should be updated to the server's, or neither based on the transmitted indications in view of a set of preconfigured update rules. If the infrastructure's version should be updated to the server's, the image of the code currently residing with the infrastructure is replaced with an image of the code currently residing with the server. If the server's version should be updated to the infrastructure's, the image of the code currently residing with the server is replaced with an image of the code currently residing with the infrastructure for the server's type.