fixup! Fix environment specific configuration