Configuration fixes for integration heat env