diff --git a/Netdisco/Makefile.PL b/Netdisco/Makefile.PL
index 35c7dcf7..ff7bd427 100644
--- a/Netdisco/Makefile.PL
+++ b/Netdisco/Makefile.PL
@@ -28,6 +28,7 @@ requires 'HTTP::Tiny' => 0.029;
 requires 'JSON' => 0;
 requires 'List::MoreUtils' => 0.33;
 requires 'MIME::Base64' => 3.13;
+requires 'Module::Find' => 0.12;
 requires 'Module::Load' => 0.32;
 requires 'Moo' => 1.001000;
 requires 'MCE' => 1.408;
diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm
index f25ef0d2..0bcc974a 100644
--- a/Netdisco/lib/App/Netdisco.pm
+++ b/Netdisco/lib/App/Netdisco.pm
@@ -7,6 +7,9 @@ use 5.010_000;
 our $VERSION = '2.027007';
 use App::Netdisco::Configuration;
 
+use Module::Find ();
+Module::Find::usesub 'App::Netdisco::Auto::Init';
+
 =head1 NAME
 
 App::Netdisco - An open source web-based network management tool.
diff --git a/Netdisco/lib/App/Netdisco/Web.pm b/Netdisco/lib/App/Netdisco/Web.pm
index dab64938..455385fd 100644
--- a/Netdisco/lib/App/Netdisco/Web.pm
+++ b/Netdisco/lib/App/Netdisco/Web.pm
@@ -10,20 +10,12 @@ use Socket6 (); # to ensure dependency is met
 use HTML::Entities (); # to ensure dependency is met
 use URI::QueryParam (); # part of URI, to add helper methods
 use Path::Class 'dir';
+use Module::Find ();
 use Module::Load ();
 use App::Netdisco::Util::Web 'interval_to_daterange';
 
-use App::Netdisco::Web::AuthN;
-use App::Netdisco::Web::Static;
-use App::Netdisco::Web::Search;
-use App::Netdisco::Web::Device;
-use App::Netdisco::Web::Report;
-use App::Netdisco::Web::AdminTask;
-use App::Netdisco::Web::TypeAhead;
-use App::Netdisco::Web::PortControl;
-use App::Netdisco::Web::Statistics;
-use App::Netdisco::Web::Password;
-use App::Netdisco::Web::GenericReport;
+Module::Find::usesub 'App::Netdisco::Web';
+Module::Find::usesub 'App::Netdisco::Auto::Web';
 
 sub _load_web_plugins {
   my $plugin_list = shift;