Revert "Revert "Update elasticsearch properties""

This reverts commit 36f440840aebecbaba0d2ee066e44c4679079ec8.