diff --git a/config/application.rb b/config/application.rb
index 96025e9f9..5316e65bf 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -43,7 +43,6 @@ module Chatwoot
     config.eager_load_paths << Rails.root.join('enterprise/listeners')
     # rubocop:disable Rails/FilePath
     config.eager_load_paths += Dir["#{Rails.root}/enterprise/app/**"]
-    config.eager_load_paths << Rails.root.join('enterprise/app/models/concerns')
     # rubocop:enable Rails/FilePath
     # Add enterprise views to the view paths
     config.paths['app/views'].unshift('enterprise/app/views')
diff --git a/enterprise/app/models/captain/assistant.rb b/enterprise/app/models/captain/assistant.rb
index 34163226e..cdf2b53f3 100644
--- a/enterprise/app/models/captain/assistant.rb
+++ b/enterprise/app/models/captain/assistant.rb
@@ -18,7 +18,7 @@
 #
 class Captain::Assistant < ApplicationRecord
   include Avatarable
-  include CaptainToolsHelpers
+  include Concerns::CaptainToolsHelpers
 
   self.table_name = 'captain_assistants'
 
diff --git a/enterprise/app/models/captain/scenario.rb b/enterprise/app/models/captain/scenario.rb
index e6b989073..69fc9eef1 100644
--- a/enterprise/app/models/captain/scenario.rb
+++ b/enterprise/app/models/captain/scenario.rb
@@ -21,7 +21,7 @@
 #  index_captain_scenarios_on_enabled                   (enabled)
 #
 class Captain::Scenario < ApplicationRecord
-  include CaptainToolsHelpers
+  include Concerns::CaptainToolsHelpers
 
   self.table_name = 'captain_scenarios'
 
diff --git a/enterprise/app/models/concerns/captain_tools_helpers.rb b/enterprise/app/models/concerns/captain_tools_helpers.rb
index 7aa924d3d..311d7e277 100644
--- a/enterprise/app/models/concerns/captain_tools_helpers.rb
+++ b/enterprise/app/models/concerns/captain_tools_helpers.rb
@@ -1,6 +1,6 @@
 # Provides helper methods for working with Captain agent tools including
 # tool resolution, text parsing, and metadata retrieval.
-module CaptainToolsHelpers
+module Concerns::CaptainToolsHelpers
   extend ActiveSupport::Concern
 
   # Regular expression pattern for matching tool references in text.
diff --git a/spec/enterprise/models/concerns/captain_tools_helpers_spec.rb b/spec/enterprise/models/concerns/captain_tools_helpers_spec.rb
index 1c441bc61..3d88522d9 100644
--- a/spec/enterprise/models/concerns/captain_tools_helpers_spec.rb
+++ b/spec/enterprise/models/concerns/captain_tools_helpers_spec.rb
@@ -1,10 +1,10 @@
 require 'rails_helper'
 
-RSpec.describe CaptainToolsHelpers, type: :concern do
+RSpec.describe Concerns::CaptainToolsHelpers, type: :concern do
   # Create a test class that includes the concern
   let(:test_class) do
     Class.new do
-      include CaptainToolsHelpers
+      include Concerns::CaptainToolsHelpers
 
       def self.name
         'TestClass'
@@ -17,7 +17,7 @@ RSpec.describe CaptainToolsHelpers, type: :concern do
   describe 'TOOL_REFERENCE_REGEX' do
     it 'matches tool references in text' do
       text = 'Use (tool://add_contact_note) and (tool://update_priority)'
-      matches = text.scan(CaptainToolsHelpers::TOOL_REFERENCE_REGEX)
+      matches = text.scan(Concerns::CaptainToolsHelpers::TOOL_REFERENCE_REGEX)
 
       expect(matches.flatten).to eq(%w[add_contact_note update_priority])
     end
@@ -32,7 +32,7 @@ RSpec.describe CaptainToolsHelpers, type: :concern do
       ]
 
       invalid_formats.each do |format|
-        matches = format.scan(CaptainToolsHelpers::TOOL_REFERENCE_REGEX)
+        matches = format.scan(Concerns::CaptainToolsHelpers::TOOL_REFERENCE_REGEX)
         expect(matches).to be_empty, "Should not match: #{format}"
       end
     end