Update handling of target architecture.

Use more generic machine targets to make application deployment more practical.