diff --git a/Justfile b/Justfile
index 409c9cd4..0992c69c 100644
--- a/Justfile
+++ b/Justfile
@@ -392,17 +392,17 @@ list-systemd:
 # Run nixpkgs-review for PR
 [linux]
 [group('nixpkgs')]
-review pr:
-  gh workflow run review.yml --repo ryan4yin/nixpkgs-review-gha -f post-result=true -f pr={{pr}}
+pkg-review pr:
+  gh workflow run review.yml --repo ryan4yin/nixpkgs-review-gha -f x86_64-darwin=no -f post-result=true -f pr={{pr}}
 
 # Run package tests for PR
 [linux]
 [group('nixpkgs')]
-test pr pname:
-  gh workflow run review.yml --repo ryan4yin/nixpkgs-review-gha -f post-result=true -f pr={{pr}} -f extra-args="-p {{pname}}.passthru.tests"
+pkg-test pr pname:
+  gh workflow run review.yml --repo ryan4yin/nixpkgs-review-gha -f x86_64-darwin=no -f post-result=true -f pr={{pr}} -f extra-args="-p {{pname}}.passthru.tests"
 
 # View the summary of a workflow
 [linux]
 [group('nixpkgs')]
-summary:
+pkg-summary:
   gh workflow view review.yml --repo ryan4yin/nixpkgs-review-gha
diff --git a/home/base/tui/container.nix b/home/base/tui/container.nix
index ecd490fc..8a552c4d 100644
--- a/home/base/tui/container.nix
+++ b/home/base/tui/container.nix
@@ -5,7 +5,7 @@
   ...
 }: {
   home.packages = with pkgs; [
-    docker-compose
+    podman-compose
     dive # explore docker layers
     lazydocker # Docker terminal UI.
     skopeo # copy/sync images between registries and local storage
diff --git a/hosts/idols-ai/default.nix b/hosts/idols-ai/default.nix
index fe67d832..5fc7ca6c 100644
--- a/hosts/idols-ai/default.nix
+++ b/hosts/idols-ai/default.nix
@@ -56,9 +56,6 @@ in {
     linkConfig.RequiredForOnline = "routable";
   };
 
-  # conflict with feature: containerd-snapshotter
-  # virtualisation.docker.storageDriver = "btrfs";
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/modules/nixos/base/user-group.nix b/modules/nixos/base/user-group.nix
index 55ee7e3a..b1422203 100644
--- a/modules/nixos/base/user-group.nix
+++ b/modules/nixos/base/user-group.nix
@@ -8,7 +8,7 @@
 
   users.groups = {
     "${myvars.username}" = {};
-    docker = {};
+    podman = {};
     wireshark = {};
     # for android platform tools's udev rules
     adbusers = {};
@@ -30,7 +30,7 @@
       "users"
       "networkmanager"
       "wheel"
-      "docker"
+      "podman"
       "wireshark"
       "adbusers"
       "libvirtd"
diff --git a/modules/nixos/desktop/virtualisation.nix b/modules/nixos/desktop/virtualisation.nix
index ab6de927..7eee567a 100644
--- a/modules/nixos/desktop/virtualisation.nix
+++ b/modules/nixos/desktop/virtualisation.nix
@@ -23,17 +23,23 @@
   boot.kernelModules = ["vfio-pci"];
 
   virtualisation = {
-    docker = {
+    docker.enable = false;
+    podman = {
       enable = true;
-      daemon.settings = {
-        # enables pulling using containerd, which supports restarting from a partial pull
-        # https://docs.docker.com/storage/containerd/
-        "features" = {"containerd-snapshotter" = true;};
+      # Create a `docker` alias for podman, to use it as a drop-in replacement
+      dockerCompat = true;
+      # Required for containers under podman-compose to be able to talk to each other.
+      defaultNetwork.settings.dns_enabled = true;
+      # Periodically prune Podman resources
+      autoPrune = {
+        enable = true;
+        dates = "weekly";
+        flags = ["--all"];
       };
+    };
 
-      # start dockerd on boot.
-      # This is required for containers which are created with the `--restart=always` flag to work.
-      enableOnBoot = true;
+    oci-containers = {
+      backend = "podman";
     };
 
     # Usage: https://wiki.nixos.org/wiki/Waydroid