diff --git a/.rubocop.yml b/.rubocop.yml
index 8c1ef03..f0fdd6f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -45,6 +45,10 @@ Rails:
 Rails/BulkChangeTable:
   Enabled: false
 
+Rails/HasAndBelongsToMany:
+  Exclude:
+    - 'app/models/role.rb'
+
 Rails/LexicallyScopedActionFilter:
   Exclude:
     - 'app/controllers/application_controller.rb'
diff --git a/app/models/account.rb b/app/models/account.rb
index 7c85cb3..8cebabc 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Account < ApplicationRecord
-  rolify role_join_table_name: 'account_roles'
+  rolify role_join_table_name: :account_roles
 
   has_one :user, dependent: :restrict_with_exception
 
diff --git a/app/models/account_role.rb b/app/models/account_role.rb
deleted file mode 100644
index 1fd018c..0000000
--- a/app/models/account_role.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-class AccountRole < ApplicationRecord
-  belongs_to :account
-  belongs_to :role
-end
diff --git a/app/models/role.rb b/app/models/role.rb
index 315cc91..172c8d3 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 class Role < ApplicationRecord
-  has_many :account_roles, dependent: :destroy
-
-  has_many :accounts, through: :account_roles, source: :account
+  has_and_belongs_to_many :accounts, join_table: :account_roles
 
   belongs_to :resource, polymorphic: true, optional: true