Add app-environment-variables and S3-storage