diff --git a/home/apps/zsh.nix b/home/apps/zsh.nix
index 105b2c4..f499331 100644
--- a/home/apps/zsh.nix
+++ b/home/apps/zsh.nix
@@ -150,6 +150,9 @@ in {
         # switch between yubikeys for the same GPG key
         switch_yubikeys = ''gpg-connect-agent "scd serialno" "learn --force" "/bye"'';
         tree = "lsd --tree";
+        # podman
+        docker = "podman";
+        docker-compose = "podman-compose";
       };
       history.path = "${config.xdg.configHome}/zsh/history";
     };
diff --git a/machines/bento/default.nix b/machines/bento/default.nix
index e400ce7..643bc3e 100644
--- a/machines/bento/default.nix
+++ b/machines/bento/default.nix
@@ -28,6 +28,5 @@
     pcscd.enable = true;
   };
 
-  virtualisation.docker.enable = true;
-  users.users."${config.dotfiles.username}".extraGroups = ["docker"];
+  virtualisation.podman.enable = true;
 }
diff --git a/machines/common/linux/traefik.nix b/machines/common/linux/traefik.nix
index 9d4b035..c7dc21c 100644
--- a/machines/common/linux/traefik.nix
+++ b/machines/common/linux/traefik.nix
@@ -1,9 +1,4 @@
 {
-  # add the traefik user to the docker group for socket access
-  users = {
-    users.traefik.extraGroups = ["docker"];
-  };
-
   services = {
     traefik = {
       enable = true;
@@ -21,6 +16,7 @@
           https.address = ":443";
         };
         providers = {
+          # TODO: adjust for podman
           docker = {
             endpoint = "unix:///var/run/docker.sock";
             exposedByDefault = false;
diff --git a/machines/futomaki/default.nix b/machines/futomaki/default.nix
index 1ed2fee..92a12ce 100644
--- a/machines/futomaki/default.nix
+++ b/machines/futomaki/default.nix
@@ -21,10 +21,10 @@
     transmission.openFirewall = true;
   };
 
-  virtualisation.docker.enable = true;
+  virtualisation.podman.enable = true;
   virtualisation.libvirtd.enable = true;
 
-  users.users."${config.dotfiles.username}".extraGroups = ["docker" "libvirtd" "transmission"];
+  users.users."${config.dotfiles.username}".extraGroups = ["libvirtd" "transmission"];
 
   environment.systemPackages = with pkgs; [
     cabextract