diff --git a/.liquibase/Data_alias/basic/2021.1.2/Duplicate/update_duplicatepattern.xml b/.liquibase/Data_alias/basic/2021.1.2/Duplicate/update_duplicatepattern.xml
index 20bb625a1e5b2957d2a3324bf6800ad528f1ed1a..507b47b0d0c403a417715f213f575e23932bf286 100644
--- a/.liquibase/Data_alias/basic/2021.1.2/Duplicate/update_duplicatepattern.xml
+++ b/.liquibase/Data_alias/basic/2021.1.2/Duplicate/update_duplicatepattern.xml
@@ -2,7 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="s.schmidt" id="a627624f-e0a8-47d7-bce1-7e4bea790ss6">
+        <changeSet dbms="!derby" author="s.schmidt" id="a627624f-e0a8-47d7-bce1-7e4bea790ss6">
         <update tableName="DUPLICATESCANNER">
             <column name="SCAN_PATTERN" value="{&quot;entity&quot;:&quot;Person_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;FIRSTNAME&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;},{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;LASTNAME&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]},{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;OR&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;STANDARD_EMAIL_COMMUNICATION&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]},{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;PERSON_ID&quot;,&quot;operator&quot;:&quot;CONTAINSNOT&quot;,&quot;value&quot;:&quot;{}&quot;,&quot;key&quot;:&quot;{}&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]},&quot;provider&quot;:&quot;Dublicates&quot;}"></column>
             <where>ID = ? and SCAN_PATTERN = ?</where>
@@ -20,4 +20,22 @@
             </whereParams>
         </update>
     </changeSet>
+    
+    <!--Derby has problems  with the second where condition ("Comparisons between 'CLOB (UCS_BASIC)' and 'CHAR (UCS_BASIC)' are not supported")
+    we do need this condition so the customer set patterns don't get overwritten.
+    No Customer usesderby, so we can just ignore the condition if dbms="derby"-->
+    <changeSet dbms="derby" author="b.ulrich" id="766e1dbc-909d-4faa-88ea-4080fb543989">
+        <update tableName="DUPLICATESCANNER">
+            <column name="SCAN_PATTERN" value="{&quot;entity&quot;:&quot;Person_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;FIRSTNAME&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;},{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;LASTNAME&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]},{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;OR&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;STANDARD_EMAIL_COMMUNICATION&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]},{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;PERSON_ID&quot;,&quot;operator&quot;:&quot;CONTAINSNOT&quot;,&quot;value&quot;:&quot;{}&quot;,&quot;key&quot;:&quot;{}&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]},&quot;provider&quot;:&quot;Dublicates&quot;}"></column>
+            <where>ID = ?</where>
+            <whereParams>
+                <param name="id" value="a8363f75-dc0a-412c-afe1-80ebacc26744"/></whereParams>
+        </update>
+        <update tableName="DUPLICATESCANNER">
+            <column name="SCAN_PATTERN" value="{&quot;entity&quot;:&quot;Organisation_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;NAME&quot;,&quot;operator&quot;:&quot;CONTAINS&quot;,&quot;value&quot;:&quot;{\&quot;exclude\&quot;: [\&quot;gmbh\&quot;, \&quot;co\&quot;, \&quot;kg\&quot;, \&quot;AG\&quot;, \&quot;bank\&quot;]}&quot;,&quot;key&quot;:&quot;{\&quot;exclude\&quot;: [\&quot;gmbh\&quot;, \&quot;co\&quot;, \&quot;kg\&quot;, \&quot;AG\&quot;, \&quot;bank\&quot;]}&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;},{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;STANDARD_CITY&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]},&quot;provider&quot;:&quot;Dublicates&quot;}"></column>
+            <where>ID = ?</where>
+            <whereParams>
+                <param name="id" value="8fa3ab66-cc01-45b6-88f3-a9e76bad7db0"/></whereParams>
+        </update>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file