Abstract: Changes to virtual workspaces, such as virtual desktops, can be managed for various users by retaining a copy of a machine image for a current workspace in addition to a new machine image for a new workspace with the changes. If compliance issues are detected, or if a user indicates an issue or desire to return to the previous workspace, a new machine instance can be launched that utilizes the previous machine image, simplifying the rollback process and enabling the user to quickly return to the previous workplace state. In some embodiments, a snapshot of the user data can be taken at the time of a workspace change, such that if the workspace is rolled back to a previous version, the data from that point in time can be attached in order to prevent loss or damage to that data as a result of the change.