Fixes AWS deployments with new abstraction layer