Simplifying build process by adding ${DISTRO}-${DATASTORE}-guest-image elements