Adding timeouts to Start and Stop endpoints to avoid hanging the build