Support fixing production cluster | Space