Trying to fix deployment flow