Attempt at fixing production env