diff --git a/pkgs/development/python-modules/ansible-doctor/default.nix b/pkgs/tools/admin/ansible/doctor.nix
similarity index 78%
rename from pkgs/development/python-modules/ansible-doctor/default.nix
rename to pkgs/tools/admin/ansible/doctor.nix
index fa2b21cbc64b..e51d2faced9d 100644
--- a/pkgs/development/python-modules/ansible-doctor/default.nix
+++ b/pkgs/tools/admin/ansible/doctor.nix
@@ -1,28 +1,13 @@
 { lib
-, anyconfig
-, appdirs
-, buildPythonPackage
-, colorama
-, environs
 , fetchFromGitHub
-, jinja2
-, jsonschema
-, nested-lookup
-, pathspec
-, poetry-core
-, python-json-logger
-, pythonOlder
-, pythonRelaxDepsHook
-, ruamel-yaml
+, python3
 }:
 
-buildPythonPackage rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "ansible-doctor";
   version = "2.0.4";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = "ansible-doctor";
@@ -37,12 +22,12 @@ buildPythonPackage rec {
       --replace 'version = "0.0.0"' 'version = "${version}"'
   '';
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with python3.pkgs; [
     poetry-core
     pythonRelaxDepsHook
   ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3.pkgs; [
     anyconfig
     appdirs
     colorama
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5bec83390d0b..236fa5e2472d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17505,7 +17505,7 @@ with pkgs;
     meta.changelog = "https://github.com/ansible/ansible/blob/v${version}/changelogs/CHANGELOG-v${lib.versions.majorMinor version}.rst";
   }));
 
-  ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor;
+  ansible-doctor = callPackage ../tools/admin/ansible/doctor.nix { };
 
   phpunit = callPackage ../development/tools/misc/phpunit { };
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 5eb1ee78bb4c..7f981f9fd7d2 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -36,6 +36,7 @@ mapAliases ({
   abodepy = jaraco-abode; # added 2023-02-01
   aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30
   ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30
+  ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute"; # Added 2023-05-16
   ansible-lint = throw "ansible-lint has been promoted to a top-level attribute"; # Added 2023-05-16
   anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
   argon2_cffi = argon2-cffi; # added 2022-05-09
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4087aa14a5c0..750e30da0078 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -494,8 +494,6 @@ self: super: with self; {
 
   ansible-core = callPackage ../development/python-modules/ansible/core.nix { };
 
-  ansible-doctor = callPackage ../development/python-modules/ansible-doctor { };
-
   ansible-kernel = callPackage ../development/python-modules/ansible-kernel { };
 
   ansible-later = callPackage ../development/python-modules/ansible-later { };