diff --git a/src/main/java/su/xserver/iikocon/iiko/IikoHandler.java b/src/main/java/su/xserver/iikocon/iiko/IikoHandler.java
index 8037cc0..caca20d 100644
--- a/src/main/java/su/xserver/iikocon/iiko/IikoHandler.java
+++ b/src/main/java/su/xserver/iikocon/iiko/IikoHandler.java
@@ -182,7 +182,7 @@ public class IikoHandler {
           report_type_id INT AUTO_INCREMENT PRIMARY KEY,
           name VARCHAR(50) UNIQUE NOT NULL,
           description TEXT NOT NULL
-      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
+      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
       """;
 
     String createFieldsCommon = """
@@ -196,7 +196,7 @@ public class IikoHandler {
           aggregation_allowed BOOLEAN NOT NULL DEFAULT 0,
           grouping_allowed BOOLEAN NOT NULL DEFAULT 0,
           filtering_allowed BOOLEAN NOT NULL DEFAULT 0
-      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
+      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
       """;
 
     String createReportTypeFields = """
@@ -206,14 +206,14 @@ public class IikoHandler {
           PRIMARY KEY (report_type_id, field_id),
           FOREIGN KEY (report_type_id) REFERENCES iiko_report_types(report_type_id) ON DELETE CASCADE,
           FOREIGN KEY (field_id) REFERENCES iiko_fields_common(field_id) ON DELETE CASCADE
-      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
+      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
       """;
 
     String createTags = """
       CREATE TABLE IF NOT EXISTS iiko_tags (
           tag_id INT AUTO_INCREMENT PRIMARY KEY,
           tag_name VARCHAR(100) UNIQUE NOT NULL
-      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
+      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
       """;
 
     String createFieldTags = """
@@ -223,7 +223,7 @@ public class IikoHandler {
           PRIMARY KEY (field_id, tag_id),
           FOREIGN KEY (field_id) REFERENCES iiko_fields_common(field_id) ON DELETE CASCADE,
           FOREIGN KEY (tag_id) REFERENCES iiko_tags(tag_id) ON DELETE CASCADE
-      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
+      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
       """;
 
     String idxKeyNormal = "CREATE INDEX IF NOT EXISTS idx_fields_common_key_normal ON iiko_fields_common(field_key_normal)";
diff --git a/src/main/java/su/xserver/iikocon/iiko/OlapQueryService.java b/src/main/java/su/xserver/iikocon/iiko/OlapQueryService.java
index dd7c864..9074b44 100644
--- a/src/main/java/su/xserver/iikocon/iiko/OlapQueryService.java
+++ b/src/main/java/su/xserver/iikocon/iiko/OlapQueryService.java
@@ -40,7 +40,7 @@ public class OlapQueryService {
           created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
           updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
           FOREIGN KEY (db_connection_id) REFERENCES external_database(id) ON DELETE RESTRICT
-      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
+      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
       """;
 
     String createQueryRestaurantsTable = """
@@ -50,7 +50,7 @@ public class OlapQueryService {
           PRIMARY KEY (query_id, restaurant_id),
           FOREIGN KEY (query_id) REFERENCES olap_queries(id) ON DELETE CASCADE,
           FOREIGN KEY (restaurant_id) REFERENCES restaurants(id) ON DELETE CASCADE
-      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
+      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
       """;
 
     return pool.query(createQueriesTable).execute()
diff --git a/src/main/java/su/xserver/iikocon/service/ExternalDataBaseService.java b/src/main/java/su/xserver/iikocon/service/ExternalDataBaseService.java
index 0158a64..b78a9f5 100644
--- a/src/main/java/su/xserver/iikocon/service/ExternalDataBaseService.java
+++ b/src/main/java/su/xserver/iikocon/service/ExternalDataBaseService.java
@@ -114,7 +114,7 @@ public class ExternalDataBaseService {
         password VARCHAR(255) NOT NULL,
         created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
         updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
-      )
+      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
       """;
     return pool.query(createTable).execute().mapEmpty();
   }
diff --git a/src/main/java/su/xserver/iikocon/service/RestaurantService.java b/src/main/java/su/xserver/iikocon/service/RestaurantService.java
index f5a9572..990b377 100644
--- a/src/main/java/su/xserver/iikocon/service/RestaurantService.java
+++ b/src/main/java/su/xserver/iikocon/service/RestaurantService.java
@@ -49,7 +49,7 @@ public class RestaurantService {
         https BOOLEAN DEFAULT FALSE,
         created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
         updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
-      )
+      ) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
       """;
     return pool.query(createTable).execute().mapEmpty();
   }
diff --git a/src/main/java/su/xserver/iikocon/service/SettingsService.java b/src/main/java/su/xserver/iikocon/service/SettingsService.java
index 8e75d4c..acd56b1 100644
--- a/src/main/java/su/xserver/iikocon/service/SettingsService.java
+++ b/src/main/java/su/xserver/iikocon/service/SettingsService.java
@@ -115,7 +115,7 @@ public class SettingsService {
         CREATE TABLE IF NOT EXISTS app_settings (
           setting_key VARCHAR(255) PRIMARY KEY,
           setting_value TEXT
-        )
+        ) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
         """;
     return pool.query(createTable).execute()
       .compose(v -> setIfAbsent("site_name", "Admin Panel"))
diff --git a/src/main/java/su/xserver/iikocon/service/UserService.java b/src/main/java/su/xserver/iikocon/service/UserService.java
index a783693..18669e9 100644
--- a/src/main/java/su/xserver/iikocon/service/UserService.java
+++ b/src/main/java/su/xserver/iikocon/service/UserService.java
@@ -31,7 +31,7 @@ public class UserService {
           ip VARCHAR(45),
           created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
           updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
-        )
+        ) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
         """;
     return pool.query(createTable).execute().mapEmpty();
   }