Cleanup in 'postgresql' role, tags moved outside