ENTESB-1154: Fix fabric patching service