diff --git a/Gemfile b/Gemfile
index d0b99d9ad..fc1e483f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,16 +69,16 @@ gem 'vite_rails'
 gem 'barnes'
 
 ##--- gems for authentication & authorization ---##
-gem 'devise', '>= 4.9.4'
-gem 'devise-secure_password', git: 'https://github.com/chatwoot/devise-secure_password', branch: 'chatwoot'
-gem 'devise_token_auth', '>= 1.2.3'
+gem 'devise'
+gem 'devise-secure_password'
+gem 'devise_token_auth'
 # authorization
 gem 'jwt'
 gem 'pundit'
 # super admin
-gem 'administrate', '>= 0.20.1'
-gem 'administrate-field-active_storage', '>= 1.0.3'
-gem 'administrate-field-belongs_to_search', '>= 0.9.0'
+gem 'administrate'
+gem 'administrate-field-active_storage'
+gem 'administrate-field-belongs_to_search'
 
 ##--- gems for pubsub service ---##
 # https://karolgalanciak.com/blog/2019/11/30/from-activerecord-callbacks-to-publish-slash-subscribe-pattern-and-event-driven-design/
diff --git a/Gemfile.lock b/Gemfile.lock
index 9e698a05a..8c23c313d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,3 @@
-GIT
-  remote: https://github.com/chatwoot/devise-secure_password
-  revision: adcc85fe1babfe40feae73dbcae64d14fff86e69
-  branch: chatwoot
-  specs:
-    devise-secure_password (2.0.1)
-      devise (>= 4.0.0, < 5.0.0)
-      railties (>= 5.0.0, < 8.0.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -115,7 +106,7 @@ GEM
       activerecord (>= 5.2, < 8.2)
       activesupport (>= 5.2, < 8.2)
     aws-eventstream (1.3.2)
-    aws-partitions (1.1062.0)
+    aws-partitions (1.1063.0)
     aws-sdk-core (3.220.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -199,6 +190,9 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
+    devise-secure_password (2.1.0)
+      devise (>= 4.0.0, < 5.0.0)
+      railties (>= 5.0.0, < 8.0.0)
     devise_token_auth (1.2.5)
       bcrypt (~> 3.0)
       devise (> 3.5.2, < 5)
@@ -922,9 +916,9 @@ DEPENDENCIES
   active_record_query_trace
   activerecord-import
   acts-as-taggable-on
-  administrate (>= 0.20.1)
-  administrate-field-active_storage (>= 1.0.3)
-  administrate-field-belongs_to_search (>= 0.9.0)
+  administrate
+  administrate-field-active_storage
+  administrate-field-belongs_to_search
   annotate
   attr_extras
   audited (~> 5.4, >= 5.4.1)
@@ -943,9 +937,9 @@ DEPENDENCIES
   database_cleaner
   ddtrace
   debug (~> 1.8)
-  devise (>= 4.9.4)
-  devise-secure_password!
-  devise_token_auth (>= 1.2.3)
+  devise
+  devise-secure_password
+  devise_token_auth
   dotenv-rails (>= 3.0.0)
   down
   elastic-apm