Implementations provide for automated container migration in a Platform-as-a-Service (PaaS) system. A method of the disclosure includes receiving, by a processing device executing a control server of a multi-tenant Platform-as-a-Service (PaaS) system, identification of a distressed node of the multi-tenant PaaS system and a resource under contention at the distressed node, providing, by the control server, identification of the resource under contention to the distressed node, receiving, by the control server, identification of a candidate container executing on the distressed node, wherein the candidate container contributes to the resource under contention on the distressed node and is launched from an instance of an application image corresponding to an application of the PaaS system, and sending, by the control server, the identification of the candidate container to a PaaS master component of the PaaS system and a request to migrate the candidate container from the distressed node.