diff --git a/app/overrides/issues.rb b/app/overrides/issues.rb
deleted file mode 100644
index ed7595a0..00000000
--- a/app/overrides/issues.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module Issues
-  Deface::Override.new(
-    :virtual_path => "issues/index",
-    :name => "deface_view_issues_index_map",
-    :insert_after => "h2",
-    :original => 'b807967c7184cb012c4bd5ccce90893349bc66e3',
-    :partial => "issues/index/map"
-  )
-
-  Deface::Override.new(
-    :virtual_path => "issues/index",
-    :name => "deface_view_issues_index_format_geojson",
-    :insert_after => "erb[loud]:contains('PDF')",
-    :original => '2b4102bf118f0a9866cf50477dce9cc7a78da6d5',
-    :partial => "issues/index/geojson"
-  )
-
-  Deface::Override.new(
-    :virtual_path => "issues/show",
-    :name => "deface_view_issues_show_map",
-    :insert_before => "div.attributes",
-    :original => '2042e7171bb2eaa98259e9ccbff8209910565e7a',
-    :partial => "issues/show/map"
-  )
-
-  Deface::Override.new(
-    :virtual_path => "issues/show",
-    :name => "deface_view_issues_show_format_geojson",
-    :insert_after => "erb[loud]:contains('PDF')",
-    :original => '1419e0dcba37f62ff95372d41d9b73845889d826',
-    :partial => "issues/show/geojson"
-  )
-end
diff --git a/app/overrides/issues/index.rb b/app/overrides/issues/index.rb
new file mode 100644
index 00000000..77dc4015
--- /dev/null
+++ b/app/overrides/issues/index.rb
@@ -0,0 +1,15 @@
+Deface::Override.new(
+  :virtual_path => "issues/index",
+  :name => "deface_view_issues_index_map",
+  :insert_after => "h2",
+  :original => 'b807967c7184cb012c4bd5ccce90893349bc66e3',
+  :partial => "issues/index/map"
+)
+
+Deface::Override.new(
+  :virtual_path => "issues/index",
+  :name => "deface_view_issues_index_format_geojson",
+  :insert_after => "erb[loud]:contains('PDF')",
+  :original => '2b4102bf118f0a9866cf50477dce9cc7a78da6d5',
+  :partial => "issues/index/geojson"
+)
diff --git a/app/overrides/issues/show.rb b/app/overrides/issues/show.rb
new file mode 100644
index 00000000..b9b0a564
--- /dev/null
+++ b/app/overrides/issues/show.rb
@@ -0,0 +1,15 @@
+Deface::Override.new(
+  :virtual_path => "issues/show",
+  :name => "deface_view_issues_show_map",
+  :insert_before => "div.attributes",
+  :original => 'c56981aa84b0fee66ff43ea773cf1444193a2862',
+  :partial => "issues/show/map"
+)
+
+Deface::Override.new(
+  :virtual_path => "issues/show",
+  :name => "deface_view_issues_show_format_geojson",
+  :insert_after => "erb[loud]:contains('PDF')",
+  :original => '1419e0dcba37f62ff95372d41d9b73845889d826',
+  :partial => "issues/show/geojson"
+)
diff --git a/app/overrides/projects.rb b/app/overrides/projects.rb
deleted file mode 100644
index 5c3a6c67..00000000
--- a/app/overrides/projects.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Projects
-  Deface::Override.new(
-    :virtual_path => "projects/show",
-    :name => "deface_view_projects_show_map",
-    :insert_bottom => "div.splitcontentright",
-    :original => 'b939fb5ea208476399dbfb4b253dcff0ab1ace91',
-    :partial => "projects/show/map"
-  )
-
-  Deface::Override.new(
-    :virtual_path => "projects/show",
-    :name => "deface_view_projects_show_other_formats",
-    :insert_bottom => "div.splitcontentright",
-    :original => '868cdb34ed1c52af47076776295dcba1311914f9',
-    :partial => "projects/show/other_formats"
-  )
-end
diff --git a/app/overrides/projects/show.rb b/app/overrides/projects/show.rb
new file mode 100644
index 00000000..8a613201
--- /dev/null
+++ b/app/overrides/projects/show.rb
@@ -0,0 +1,15 @@
+Deface::Override.new(
+  :virtual_path => "projects/show",
+  :name => "deface_view_projects_show_map",
+  :insert_bottom => "div.splitcontentright",
+  :original => 'b939fb5ea208476399dbfb4b253dcff0ab1ace91',
+  :partial => "projects/show/map"
+)
+
+Deface::Override.new(
+  :virtual_path => "projects/show",
+  :name => "deface_view_projects_show_other_formats",
+  :insert_bottom => "div.splitcontentright",
+  :original => '1d2f0cb0b1439dddc34ac9c50b6b1b111fe702ce',
+  :partial => "projects/show/other_formats"
+)
diff --git a/app/overrides/users.rb b/app/overrides/users.rb
deleted file mode 100644
index de3b5836..00000000
--- a/app/overrides/users.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module Users
-  Deface::Override.new(
-    :virtual_path => "users/show",
-    :name => "deface_view_users_show_other_formats",
-    :insert_bottom => "div.splitcontentleft",
-    :partial => "users/show/other_formats"
-  )
-end
diff --git a/app/overrides/users/show.rb b/app/overrides/users/show.rb
new file mode 100644
index 00000000..1960a447
--- /dev/null
+++ b/app/overrides/users/show.rb
@@ -0,0 +1,7 @@
+Deface::Override.new(
+  :virtual_path => "users/show",
+  :name => "deface_view_users_show_other_formats",
+  :insert_bottom => "div.splitcontentleft",
+  :original => 'abe916df0691ebe8848cfc0dde536abd3bfe39b8',
+  :partial => "users/show/other_formats"
+)
diff --git a/init.rb b/init.rb
index 14ae8292..612a33cf 100644
--- a/init.rb
+++ b/init.rb
@@ -57,9 +57,10 @@
 end
 
 if Rails.version > '6.0' && Rails.autoloaders.zeitwerk_enabled?
-  require File.expand_path('../app/overrides/issues', __FILE__)
-  require File.expand_path('../app/overrides/projects', __FILE__)
-  require File.expand_path('../app/overrides/users', __FILE__)
+  Dir.glob("#{Rails.root}/plugins/redmine_gtt/app/overrides/**/*.rb").each do |path|
+    Rails.autoloaders.main.ignore(path)
+    load File.expand_path(path, __FILE__)
+  end
   RedmineGtt.setup_normal_patches
   Rails.application.config.after_initialize do
     RedmineGtt.setup_controller_patches