diff --git a/src/libcrun/linux.c b/src/libcrun/linux.c
index 61f8a8af0..b238e9db6 100644
--- a/src/libcrun/linux.c
+++ b/src/libcrun/linux.c
@@ -1410,7 +1410,7 @@ libcrun_set_usernamespace (libcrun_container_t *container, pid_t pid, libcrun_er
 
   if (!def->linux->gid_mappings_len)
     {
-      gid_map_len = format_default_id_mapping (&gid_map, container->container_uid, container->host_gid, 0);
+      gid_map_len = format_default_id_mapping (&gid_map, container->container_gid, container->host_uid, 0);
       if (gid_map == NULL)
         {
           if (container->host_gid)
diff --git a/src/libcrun/utils.c b/src/libcrun/utils.c
index dd68758e7..8ac317605 100644
--- a/src/libcrun/utils.c
+++ b/src/libcrun/utils.c
@@ -668,21 +668,10 @@ getsubidrange (uid_t id, int is_uid, uint32_t *from, uint32_t *len)
   cleanup_free char *lineptr = NULL;
   size_t lenlineptr = 0, len_name;
   const char *name;
-
-  if (is_uid)
-    {
-      struct passwd *pwd = getpwuid (id);
-      if (pwd == NULL)
-        return -1;
-      name = pwd->pw_name;
-    }
-  else
-    {
-      struct group *grp = getgrgid (id);
-      if (grp == NULL)
-        return -1;
-      name = grp->gr_name;
-    }
+  struct passwd *pwd = getpwuid (id);
+  if (pwd == NULL)
+    return -1;
+  name = pwd->pw_name;
 
   len_name = strlen (name);