Refactor ephemeral update code and recreate it if not found