diff --git a/service/device/registry/internal/src/main/resources/liquibase/2.0.0/changelog-device-2.0.0.xml b/service/device/registry/internal/src/main/resources/liquibase/2.0.0/changelog-device-2.0.0.xml
index 97a336ae634..fc7325cdbc2 100644
--- a/service/device/registry/internal/src/main/resources/liquibase/2.0.0/changelog-device-2.0.0.xml
+++ b/service/device/registry/internal/src/main/resources/liquibase/2.0.0/changelog-device-2.0.0.xml
@@ -21,5 +21,7 @@
     <include relativeToChangelogFile="true" file="./device-add-clob-ip-if-columns.xml"/>
     <include relativeToChangelogFile="true" file="./device_connection-add_auth_type_column.xml"/>
     <include relativeToChangelogFile="true" file="./device_tamper-status.xml"/>
+    <include relativeToChangelogFile="true" file="./device-client_id_binary.xml"/>
+    <include relativeToChangelogFile="true" file="./device_connection-client_id_binary.xml"/>
 
 </databaseChangeLog>
diff --git a/service/device/registry/internal/src/main/resources/liquibase/2.0.0/device-client_id_binary.xml b/service/device/registry/internal/src/main/resources/liquibase/2.0.0/device-client_id_binary.xml
new file mode 100644
index 00000000000..319f853fa58
--- /dev/null
+++ b/service/device/registry/internal/src/main/resources/liquibase/2.0.0/device-client_id_binary.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
+
+    This program and the accompanying materials are made
+    available under the terms of the Eclipse Public License 2.0
+    which is available at https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        Eurotech - initial API and implementation
+-->
+<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.0.xsd"
+        logicalFilePath="KapuaDB/changelog-device-2.0.0.xml">
+
+    <include relativeToChangelogFile="true" file="../common-properties.xml"/>
+
+    <changeSet id="device-client_id_binary" author="eurotech" dbms="mysql, mariadb">
+
+        <modifyDataType tableName="dvc_device" columnName="client_id" newDataType="varchar(255) BINARY"/>
+        <addNotNullConstraint tableName="dvc_device" columnDataType="varchar(255) BINARY" columnName="client_id"/>
+
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/service/device/registry/internal/src/main/resources/liquibase/2.0.0/device_connection-client_id_binary.xml b/service/device/registry/internal/src/main/resources/liquibase/2.0.0/device_connection-client_id_binary.xml
new file mode 100644
index 00000000000..7528a43a076
--- /dev/null
+++ b/service/device/registry/internal/src/main/resources/liquibase/2.0.0/device_connection-client_id_binary.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
+
+    This program and the accompanying materials are made
+    available under the terms of the Eclipse Public License 2.0
+    which is available at https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        Eurotech - initial API and implementation
+-->
+<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.0.xsd"
+        logicalFilePath="KapuaDB/changelog-device-2.0.0.xml">
+
+    <include relativeToChangelogFile="true" file="../common-properties.xml"/>
+
+    <changeSet id="device_connection-client-id-binary" author="eurotech" dbms="mysql, mariadb">
+
+        <modifyDataType tableName="dvc_device_connection" columnName="client_id" newDataType="varchar(255) BINARY"/>
+        <addNotNullConstraint tableName="dvc_device_connection" columnDataType="varchar(255) BINARY" columnName="client_id"/>
+
+    </changeSet>
+
+</databaseChangeLog>