diff --git a/system/dev/docker.nix b/system/dev/docker.nix
index 6344128..eed390b 100644
--- a/system/dev/docker.nix
+++ b/system/dev/docker.nix
@@ -14,11 +14,16 @@ in {
     autoprune.enable = mkEnableOption "Enable autoprune";
   };
 
-  config = {
-    environment.systemPackages = mkIf cfg.podman.enable [
-      pkgs.podman-desktop
-      pkgs.podman-compose
-    ];
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs;
+      [
+        dive # A tool for exploring each layer in a docker image
+        grype # Vulnerability scanner for container images and filesystems
+      ]
+      ++ lists.optionals cfg.podman.enable [
+        podman-compose
+        podman-desktop
+      ];
     virtualisation = mkIf cfg.enable {
       docker = mkIf (!cfg.podman.enable) {
         enable = true;
diff --git a/users/phundrak/packages.nix b/users/phundrak/packages.nix
index 8441c6a..e79408b 100644
--- a/users/phundrak/packages.nix
+++ b/users/phundrak/packages.nix
@@ -69,8 +69,6 @@ with lib; {
 
     # Dev
     devenv
-    dive # A tool for exploring each layer in a docker image
-    grype # Vulnerability scanner for container images and filesystems
     tectonic # better LaTeX engine
     zeal