diff --git a/pkgs/tools/networking/octodns/default.nix b/pkgs/tools/networking/octodns/default.nix
index 618b2a0b57f1..d59389f8b273 100644
--- a/pkgs/tools/networking/octodns/default.nix
+++ b/pkgs/tools/networking/octodns/default.nix
@@ -51,6 +51,13 @@ python3Packages.buildPythonApplication rec {
   pythonImportsCheck = [ "octodns" ];
 
   passthru = {
+    providers = lib.recurseIntoAttrs (
+      lib.packagesFromDirectoryRecursive {
+        inherit (python3Packages) callPackage;
+        directory = ./providers;
+      }
+    );
+
     withProviders =
       ps:
       let
diff --git a/pkgs/tools/networking/octodns/providers/bind/default.nix b/pkgs/tools/networking/octodns/providers/bind/package.nix
similarity index 100%
rename from pkgs/tools/networking/octodns/providers/bind/default.nix
rename to pkgs/tools/networking/octodns/providers/bind/package.nix
diff --git a/pkgs/tools/networking/octodns/providers/cloudflare/default.nix b/pkgs/tools/networking/octodns/providers/cloudflare/package.nix
similarity index 100%
rename from pkgs/tools/networking/octodns/providers/cloudflare/default.nix
rename to pkgs/tools/networking/octodns/providers/cloudflare/package.nix
diff --git a/pkgs/tools/networking/octodns/providers/ddns/default.nix b/pkgs/tools/networking/octodns/providers/ddns/package.nix
similarity index 100%
rename from pkgs/tools/networking/octodns/providers/ddns/default.nix
rename to pkgs/tools/networking/octodns/providers/ddns/package.nix
diff --git a/pkgs/tools/networking/octodns/providers/gandi/default.nix b/pkgs/tools/networking/octodns/providers/gandi/package.nix
similarity index 100%
rename from pkgs/tools/networking/octodns/providers/gandi/default.nix
rename to pkgs/tools/networking/octodns/providers/gandi/package.nix
diff --git a/pkgs/tools/networking/octodns/providers/hetzner/default.nix b/pkgs/tools/networking/octodns/providers/hetzner/package.nix
similarity index 100%
rename from pkgs/tools/networking/octodns/providers/hetzner/default.nix
rename to pkgs/tools/networking/octodns/providers/hetzner/package.nix
diff --git a/pkgs/tools/networking/octodns/providers/powerdns/default.nix b/pkgs/tools/networking/octodns/providers/powerdns/package.nix
similarity index 100%
rename from pkgs/tools/networking/octodns/providers/powerdns/default.nix
rename to pkgs/tools/networking/octodns/providers/powerdns/package.nix
diff --git a/pkgs/tools/networking/octodns/providers/transip/default.nix b/pkgs/tools/networking/octodns/providers/transip/package.nix
similarity index 100%
rename from pkgs/tools/networking/octodns/providers/transip/default.nix
rename to pkgs/tools/networking/octodns/providers/transip/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38cd136163d6..066d71b71670 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -421,15 +421,7 @@ with pkgs;
 
   octodns = callPackage ../tools/networking/octodns { };
 
-  octodns-providers = recurseIntoAttrs {
-    bind = python3Packages.callPackage ../tools/networking/octodns/providers/bind { };
-    gandi = python3Packages.callPackage ../tools/networking/octodns/providers/gandi { };
-    hetzner = python3Packages.callPackage ../tools/networking/octodns/providers/hetzner { };
-    powerdns = python3Packages.callPackage ../tools/networking/octodns/providers/powerdns { };
-    cloudflare = python3Packages.callPackage ../tools/networking/octodns/providers/cloudflare { };
-    ddns = python3Packages.callPackage ../tools/networking/octodns/providers/ddns { };
-    transip = python3Packages.callPackage ../tools/networking/octodns/providers/transip { };
-  };
+  octodns-providers = octodns.providers;
 
   oletools = with python3.pkgs; toPythonApplication oletools;