diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3c542c..c558631 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,6 @@
 ### Improvements
 - Fixed the bug regarding `hide()` in `GroupChannel`
 - Fixed the issue regarding websocket security
-- Updated `isar` package to v3.1.8
 
 ## v4.2.22 (Aug 23, 2024)
 
diff --git a/lib/src/internal/db/schema/channel/c_feed_channel.g.dart b/lib/src/internal/db/schema/channel/c_feed_channel.g.dart
index d376ba5..a5525d2 100644
--- a/lib/src/internal/db/schema/channel/c_feed_channel.g.dart
+++ b/lib/src/internal/db/schema/channel/c_feed_channel.g.dart
@@ -143,7 +143,7 @@ final CFeedChannelSchema = CollectionSchema(
   getId: _cFeedChannelGetId,
   getLinks: _cFeedChannelGetLinks,
   attach: _cFeedChannelAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _cFeedChannelEstimateSize(
diff --git a/lib/src/internal/db/schema/channel/c_group_channel.g.dart b/lib/src/internal/db/schema/channel/c_group_channel.g.dart
index fecb879..0660d61 100644
--- a/lib/src/internal/db/schema/channel/c_group_channel.g.dart
+++ b/lib/src/internal/db/schema/channel/c_group_channel.g.dart
@@ -315,7 +315,7 @@ final CGroupChannelSchema = CollectionSchema(
   getId: _cGroupChannelGetId,
   getLinks: _cGroupChannelGetLinks,
   attach: _cGroupChannelAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _cGroupChannelEstimateSize(
diff --git a/lib/src/internal/db/schema/channel/meta/c_channel_info.g.dart b/lib/src/internal/db/schema/channel/meta/c_channel_info.g.dart
index b6fb623..d419b63 100644
--- a/lib/src/internal/db/schema/channel/meta/c_channel_info.g.dart
+++ b/lib/src/internal/db/schema/channel/meta/c_channel_info.g.dart
@@ -39,7 +39,7 @@ final CChannelInfoSchema = CollectionSchema(
   getId: _cChannelInfoGetId,
   getLinks: _cChannelInfoGetLinks,
   attach: _cChannelInfoAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _cChannelInfoEstimateSize(
diff --git a/lib/src/internal/db/schema/chunk/c_channel_chunk.g.dart b/lib/src/internal/db/schema/chunk/c_channel_chunk.g.dart
index 3779b3e..a8163c0 100644
--- a/lib/src/internal/db/schema/chunk/c_channel_chunk.g.dart
+++ b/lib/src/internal/db/schema/chunk/c_channel_chunk.g.dart
@@ -55,7 +55,7 @@ final CChannelChunkSchema = CollectionSchema(
   getId: _cChannelChunkGetId,
   getLinks: _cChannelChunkGetLinks,
   attach: _cChannelChunkAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _cChannelChunkEstimateSize(
diff --git a/lib/src/internal/db/schema/chunk/c_message_chunk.g.dart b/lib/src/internal/db/schema/chunk/c_message_chunk.g.dart
index 2b23bce..f382a1c 100644
--- a/lib/src/internal/db/schema/chunk/c_message_chunk.g.dart
+++ b/lib/src/internal/db/schema/chunk/c_message_chunk.g.dart
@@ -54,7 +54,7 @@ final CMessageChunkSchema = CollectionSchema(
   getId: _cMessageChunkGetId,
   getLinks: _cMessageChunkGetLinks,
   attach: _cMessageChunkAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _cMessageChunkEstimateSize(
diff --git a/lib/src/internal/db/schema/login/c_login.g.dart b/lib/src/internal/db/schema/login/c_login.g.dart
index 0af6d67..5d44f5c 100644
--- a/lib/src/internal/db/schema/login/c_login.g.dart
+++ b/lib/src/internal/db/schema/login/c_login.g.dart
@@ -85,7 +85,7 @@ final CLoginSchema = CollectionSchema(
   getId: _cLoginGetId,
   getLinks: _cLoginGetLinks,
   attach: _cLoginAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _cLoginEstimateSize(
diff --git a/lib/src/internal/db/schema/message/c_admin_message.g.dart b/lib/src/internal/db/schema/message/c_admin_message.g.dart
index 8822ae4..00b5a67 100644
--- a/lib/src/internal/db/schema/message/c_admin_message.g.dart
+++ b/lib/src/internal/db/schema/message/c_admin_message.g.dart
@@ -261,7 +261,7 @@ final CAdminMessageSchema = CollectionSchema(
   getId: _cAdminMessageGetId,
   getLinks: _cAdminMessageGetLinks,
   attach: _cAdminMessageAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _cAdminMessageEstimateSize(
diff --git a/lib/src/internal/db/schema/message/c_file_message.g.dart b/lib/src/internal/db/schema/message/c_file_message.g.dart
index c0c9f5c..9586bcc 100644
--- a/lib/src/internal/db/schema/message/c_file_message.g.dart
+++ b/lib/src/internal/db/schema/message/c_file_message.g.dart
@@ -302,7 +302,7 @@ final CFileMessageSchema = CollectionSchema(
   getId: _cFileMessageGetId,
   getLinks: _cFileMessageGetLinks,
   attach: _cFileMessageAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _cFileMessageEstimateSize(
diff --git a/lib/src/internal/db/schema/message/c_notification_message.g.dart b/lib/src/internal/db/schema/message/c_notification_message.g.dart
index c186ac8..4a56612 100644
--- a/lib/src/internal/db/schema/message/c_notification_message.g.dart
+++ b/lib/src/internal/db/schema/message/c_notification_message.g.dart
@@ -182,7 +182,7 @@ final CNotificationMessageSchema = CollectionSchema(
   getId: _cNotificationMessageGetId,
   getLinks: _cNotificationMessageGetLinks,
   attach: _cNotificationMessageAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _cNotificationMessageEstimateSize(
diff --git a/lib/src/internal/db/schema/message/c_user_message.g.dart b/lib/src/internal/db/schema/message/c_user_message.g.dart
index 14cb966..f3bf1de 100644
--- a/lib/src/internal/db/schema/message/c_user_message.g.dart
+++ b/lib/src/internal/db/schema/message/c_user_message.g.dart
@@ -280,7 +280,7 @@ final CUserMessageSchema = CollectionSchema(
   getId: _cUserMessageGetId,
   getLinks: _cUserMessageGetLinks,
   attach: _cUserMessageAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _cUserMessageEstimateSize(
diff --git a/lib/src/internal/db/schema/message/meta/c_channel_access.g.dart b/lib/src/internal/db/schema/message/meta/c_channel_access.g.dart
index fe8faf4..426a70e 100644
--- a/lib/src/internal/db/schema/message/meta/c_channel_access.g.dart
+++ b/lib/src/internal/db/schema/message/meta/c_channel_access.g.dart
@@ -66,7 +66,7 @@ final CChannelAccessSchema = CollectionSchema(
   getId: _cChannelAccessGetId,
   getLinks: _cChannelAccessGetLinks,
   attach: _cChannelAccessAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _cChannelAccessEstimateSize(
diff --git a/lib/src/internal/db/schema/message/meta/c_channel_message.g.dart b/lib/src/internal/db/schema/message/meta/c_channel_message.g.dart
index d8c55e6..84dc01d 100644
--- a/lib/src/internal/db/schema/message/meta/c_channel_message.g.dart
+++ b/lib/src/internal/db/schema/message/meta/c_channel_message.g.dart
@@ -161,7 +161,7 @@ final CChannelMessageSchema = CollectionSchema(
   getId: _cChannelMessageGetId,
   getLinks: _cChannelMessageGetLinks,
   attach: _cChannelMessageAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _cChannelMessageEstimateSize(
diff --git a/lib/src/internal/db/schema/message/meta/c_message_changelog_info.g.dart b/lib/src/internal/db/schema/message/meta/c_message_changelog_info.g.dart
index 74e03b4..7acb9fd 100644
--- a/lib/src/internal/db/schema/message/meta/c_message_changelog_info.g.dart
+++ b/lib/src/internal/db/schema/message/meta/c_message_changelog_info.g.dart
@@ -59,7 +59,7 @@ final CMessageChangeLogInfoSchema = CollectionSchema(
   getId: _cMessageChangeLogInfoGetId,
   getLinks: _cMessageChangeLogInfoGetLinks,
   attach: _cMessageChangeLogInfoAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _cMessageChangeLogInfoEstimateSize(
diff --git a/lib/src/internal/db/schema/user/c_user.g.dart b/lib/src/internal/db/schema/user/c_user.g.dart
index 359b9db..96569d5 100644
--- a/lib/src/internal/db/schema/user/c_user.g.dart
+++ b/lib/src/internal/db/schema/user/c_user.g.dart
@@ -99,7 +99,7 @@ final CUserSchema = CollectionSchema(
   getId: _cUserGetId,
   getLinks: _cUserGetLinks,
   attach: _cUserAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _cUserEstimateSize(
diff --git a/pubspec.yaml b/pubspec.yaml
index abb81cb..5d95b58 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -30,12 +30,8 @@ dependencies:
   web_socket_channel: ^2.4.0
   universal_io: ^2.2.0
   async: ^2.10.0
-  isar:
-    version: ^3.1.8
-    hosted: https://pub.isar-community.dev/
-  isar_flutter_libs:
-    version: ^3.1.8
-    hosted: https://pub.isar-community.dev/
+  isar: ^3.1.0+1
+  isar_flutter_libs: ^3.1.0+1
   path_provider: ^2.1.1
   path: ^1.8.2
 
@@ -47,6 +43,4 @@ dev_dependencies:
   stack_trace: ^1.11.0
   json_serializable: ^6.6.2
   build_runner: ^2.3.3
-  isar_generator:
-    version: ^3.1.8
-    hosted: https://pub.isar-community.dev/
+  isar_generator: ^3.1.0+1