diff --git a/machines/thinkman/system.nix b/machines/thinkman/system.nix
index f24339b..cf0b0a2 100644
--- a/machines/thinkman/system.nix
+++ b/machines/thinkman/system.nix
@@ -6,10 +6,10 @@ in
 {
   my.system = {
     avahi.enable = true;
-    podman.enable = true;
-    virtualization = {
+    kvm = {
       enable = true;
       cpuFlavor = "intel";
     };
+    podman.enable = true;
   };
 }
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 8852d1e..397e7ff 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -3,8 +3,7 @@
   imports = [
     ./avahi
     ./docker
+    ./kvm
     ./podman
-    ./virtualization
   ];
 }
-
diff --git a/modules/system/virtualization/default.nix b/modules/system/kvm/default.nix
similarity index 81%
rename from modules/system/virtualization/default.nix
rename to modules/system/kvm/default.nix
index c04d995..e8b9d2c 100644
--- a/modules/system/virtualization/default.nix
+++ b/modules/system/kvm/default.nix
@@ -1,10 +1,10 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.my.system.virtualization;
+  cfg = config.my.system.kvm;
 in
 {
-  options.my.system.virtualization = with lib; {
-    enable = mkEnableOption "virtualization configuration";
+  options.my.system.kvm = with lib; {
+    enable = mkEnableOption "kvm configuration";
 
     cpuFlavor = mkOption {
       type = with types; nullOr (enum [ "intel" "amd" ]);
diff --git a/modules/system/podman/default.nix b/modules/system/podman/default.nix
index 6b0cc3f..c919bd8 100644
--- a/modules/system/podman/default.nix
+++ b/modules/system/podman/default.nix
@@ -18,7 +18,8 @@ in
       enable = true;
 
       # Use fake `docker` command to redirect to `podman`
-      dockerCompat = true;
+      # but only if docker is not enabled
+      dockerCompat = !config.my.system.docker.enable;
 
       # Expose a docker-like socket
       dockerSocket.enable = true;