diff --git a/default.nix b/default.nix
index f4c71b0..fb4034d 100644
--- a/default.nix
+++ b/default.nix
@@ -6,22 +6,26 @@ in
 with pkgs; {
 	illustris = import ./by-maintainer.nix args;
 	homelab = {
-		inherit (nixosTests) hedgedoc jitsi-meet searx;
-		#inherit (nixosTests) jibri zfs;
+		inherit (nixosTests) jitsi-meet searx;
+		#inherit (nixosTests) hedgedoc jibri zfs;
 	};
-	misc = {
-		hadoop = {
-			inherit (nixosTests) hadoop;
-			# https://github.com/NixOS/nixpkgs/pull/154004
-			#inherit (nixosTests) hadoop_3_2 hadoop2;
-		};
+	dataPlatform = {
+		inherit (nixosTests) hadoop spark;
+		# https://github.com/NixOS/nixpkgs/pull/154004
+		#inherit (nixosTests) hadoop_3_2 hadoop2;
+	};
+	work = {
+		inherit (nixosTests) keepalived nginx vault;
 		sssd = { inherit (nixosTests) sssd sssd-ldap; };
-		prometheus = {
-			inherit (nixosTests) prometheus;
-			#inherit (nixosTests) prometheus-exporters;
-		};
-		inherit (nixosTests) kafka keepalived keycloak nginx php postgresql signal-desktop spark vault;
+		# inherit (nixosTests) keycloak
 	};
+	#misc = {
+	#	#prometheus = {
+	#	#	inherit (nixosTests) prometheus;
+	#	#	#inherit (nixosTests) prometheus-exporters;
+	#	#};
+	#	#inherit (nixosTests) kafka php postgresql signal-desktop;
+	#};
 	#disabled = {
 	#	mysql = { inherit (nixosTests) mysql mysql-autobackup mysql-backup mysql-replication; };
 	#};