diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 7efff7f45eca..caee548d719c 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -33,10 +33,11 @@ with lib.maintainers; {
 
   podman = {
     members = [
+      adisbladis
       saschagrunert
       vdemeester
       zowoq
     ];
-    scope = "Maintain podman related packages.";
+    scope = "Maintain Podman related packages and modules.";
   };
 }
diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix
index c1777eb95d94..aa4846837c43 100644
--- a/nixos/modules/virtualisation/podman.nix
+++ b/nixos/modules/virtualisation/podman.nix
@@ -37,6 +37,9 @@ let
   '';
 in
 {
+  meta = {
+    maintainers = lib.teams.podman.members;
+  };
 
   options.virtualisation.podman = {
 
@@ -143,7 +146,6 @@ in
       pkgs.runc # Default container runtime
       pkgs.crun # Default container runtime (cgroups v2)
       pkgs.conmon # Container runtime monitor
-      pkgs.skopeo # Interact with container registry
       pkgs.slirp4netns # User-mode networking for unprivileged namespaces
       pkgs.fuse-overlayfs # CoW for images, much faster than default vfs
       pkgs.utillinux # nsenter
@@ -180,7 +182,7 @@ in
             offset = acc.offset + 65536;
           }
         )
-          { values = []; offset = 100000; } cfg.users
+        { values = []; offset = 100000; } (lib.unique cfg.users)
       ).values
     );
 
diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix
index 601a6791c2f7..ccfe8334a160 100644
--- a/nixos/tests/podman.nix
+++ b/nixos/tests/podman.nix
@@ -1,10 +1,10 @@
 # This test runs podman and checks if simple container starts
 
 import ./make-test-python.nix (
-  { pkgs, ... }: {
+  { pkgs, lib, ... }: {
     name = "podman";
-    meta = with pkgs.stdenv.lib.maintainers; {
-      maintainers = [ adisbladis ];
+    meta = {
+      maintainers = lib.teams.podman.members;
     };
 
     nodes = {