diff --git a/pkgs/by-name/ic/icinga2-agent/package.nix b/pkgs/by-name/ic/icinga2-agent/package.nix
new file mode 100644
index 000000000000..02e9371dae26
--- /dev/null
+++ b/pkgs/by-name/ic/icinga2-agent/package.nix
@@ -0,0 +1,8 @@
+{ icinga2 }:
+icinga2.override {
+  nameSuffix = "-agent";
+  withMysql = false;
+  withNotification = false;
+  withIcingadb = false;
+  withPerfdata = false;
+}
diff --git a/pkgs/servers/monitoring/icinga2/etc-icinga2.patch b/pkgs/by-name/ic/icinga2/etc-icinga2.patch
similarity index 100%
rename from pkgs/servers/monitoring/icinga2/etc-icinga2.patch
rename to pkgs/by-name/ic/icinga2/etc-icinga2.patch
diff --git a/pkgs/servers/monitoring/icinga2/no-systemd-service.patch b/pkgs/by-name/ic/icinga2/no-systemd-service.patch
similarity index 100%
rename from pkgs/servers/monitoring/icinga2/no-systemd-service.patch
rename to pkgs/by-name/ic/icinga2/no-systemd-service.patch
diff --git a/pkgs/servers/monitoring/icinga2/no-var-directories.patch b/pkgs/by-name/ic/icinga2/no-var-directories.patch
similarity index 100%
rename from pkgs/servers/monitoring/icinga2/no-var-directories.patch
rename to pkgs/by-name/ic/icinga2/no-var-directories.patch
diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/by-name/ic/icinga2/package.nix
similarity index 93%
rename from pkgs/servers/monitoring/icinga2/default.nix
rename to pkgs/by-name/ic/icinga2/package.nix
index 21b39213e5ea..69aff4ef2cc5 100644
--- a/pkgs/servers/monitoring/icinga2/default.nix
+++ b/pkgs/by-name/ic/icinga2/package.nix
@@ -28,14 +28,14 @@
   nameSuffix ? "",
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "icinga2${nameSuffix}";
   version = "2.15.1";
 
   src = fetchFromGitHub {
     owner = "icinga";
     repo = "icinga2";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-w/eD07yzBm3x4G74OuGwkmpBzj63UoklmcKxVi5lx8E=";
   };
 
@@ -118,9 +118,9 @@ stdenv.mkDerivation rec {
     ''}
   '';
 
-  vim = runCommand "vim-icinga2-${version}" { pname = "vim-icinga2"; } ''
+  vim = runCommand "vim-icinga2-${finalAttrs.version}" { pname = "vim-icinga2"; } ''
     mkdir -p $out/share/vim-plugins
-    cp -r "${src}/tools/syntax/vim" $out/share/vim-plugins/icinga2
+    cp -r "${finalAttrs.src}/tools/syntax/vim" $out/share/vim-plugins/icinga2
   '';
 
   meta = {
@@ -133,4 +133,4 @@ stdenv.mkDerivation rec {
       helsinki-Jo
     ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 626f4a9110c2..637de22b5c8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8408,16 +8408,6 @@ with pkgs;
     mir_2_15
     ;
 
-  icinga2 = callPackage ../servers/monitoring/icinga2 { };
-
-  icinga2-agent = callPackage ../servers/monitoring/icinga2 {
-    nameSuffix = "-agent";
-    withMysql = false;
-    withNotification = false;
-    withIcingadb = false;
-    withPerfdata = false;
-  };
-
   nagiosPlugins = recurseIntoAttrs (callPackages ../servers/monitoring/nagios-plugins { });
 
   qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { };