KRACOEUS-6996: repackage non-service related watermark