diff --git a/clusters/stokes/users.nix b/clusters/stokes/users.nix
index 0643170..86d26b1 100644
--- a/clusters/stokes/users.nix
+++ b/clusters/stokes/users.nix
@@ -15,6 +15,8 @@
     bast = { gid = 1010; };
     marius = { gid = 1011; };
     michael = { gid = 1012; };
+    yugaos = { gid = 1013; };
+    ata = { gid = 1014; };
     # @grp@
 
     sif = {
@@ -32,6 +34,19 @@
         "ovanov"
         "peyghamg"
         "qin"
+        "yugaos"
+        "ata"
+      ];
+    };
+
+    matnoc = {
+      gid = 11001;
+      members = [
+        "jonas"
+        "olean"
+        "bast"
+        "frankgaa"
+        "hes"
       ];
     };
   };
@@ -126,7 +141,7 @@
       isNormalUser = true;
       createHome = true;
       openssh.authorizedKeys.keys = [
-        "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAxOM63++alCeL0dcFdLx5O6YugdXZlcqzNIWgQS42RdhGxHdBzW5Y47KMdbQyp12EAH4kgRaNQ79HkHpDIX9qf4EytVgcWNgZePRnr+sX6vsm1jpeq2jy52CDUIQTmoF8Qh+zGFXuiuYFOFkZ6YokknkEzubfR2w0JMHocD4XS5ZxBn80QVmTL4qH2/1eR2WGhnNdwBI1c1CHDWbKD/iaQAWQMe46jJqHgYRLrZ8ODG8Ucz1/4kZF3B+pmV8gMaaVFC/+ncWuZa3B1zqoOeVbf49qjPKJcCw+5BCo2ZoLPpFQANMvbbth8dHnv4gE7zTK3dHmEPqibsran7++J0LNow== rsa-key-20201217"
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDH/05mXyrYgxlWazFDtTJBCCB4YzQQiPcAkeeolztt320CPQ+pRyLgCzyAVGT5AlisXanHyWFSsPXrfM5MRNbm2U87s8DoZLZS5CYMk+ieGKdbac8jUgaw16EKyW05NHfHhDGYL+DyTQ76WAe/btzgDpvkal5B824a6abqc/oYz7D5rnAqoIpt56m1BG3tJrSz8K3nbOGpnMKt3vlVSLqZ6WNtSfXT+hHjOTfacQYH9XGQn/nYIuUzgDUswiboJ8nox5eduJxFrUHY6GGFiFeX6+hxIZUOZZm4hff01+sBxWy4y727tzCTbZIw2ERKcxu94BOC/EJsIyQDkaHwzaIwP7bB8V5yqpz7Fjgt5Bu+pMxUV8uwZmA5S5r3UuXlKHaspaqDR7RVjCUWcwCSgMYioxLtcnZr2DdKuezXbOU8O/FRsxuqFEzZTeCrckAi8gFzTanIZYmkwujjRg1hidOMc5qcn2yH/5NyBlQ+Y4XjD0XTMjSLpONczuyG3t6SJpE= haavaes@nzinga"
       ];
     };
 
@@ -189,6 +204,7 @@
       createHome = true;
       openssh.authorizedKeys.keys = [
         "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEA8cclW3+wlmFl4fNEIqudlrtKVsZCXdzLgXNaGnqZPbqUCVXqw6rigFXSPYnRnE47yi8heC+06ga+4l8LkAuFCPhoZN6xxq6M7qmlNRHtpNn6PrXuDaTkgNig9TD2BCbHGwkqIByPhea4qQbM0mLKRk+a4H0ZGHsJnZI+nm185sSo6jQJ1gCHLk6ZZOoRDGYjoZIs3En3fTSTJBfbluf5A/gVXf2pbvIQ+R5QEOszRcln6nFfTd2Lwu2t63jA1pHN3KQoKcJ9RtBrRC0ZgZrOlEU1bpGLwuHwpj5xoxlsoI49QMgqJL4PE06mNGLYuxl6N/Sj6l90fuPFrEQpf45S0w== rsa-key-20201217"
+        "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvn2P+ID0J4SEIZF22Ewx4YqrUxgM78eUPZPtEngvQhi+s+lROpmkPPG7JQ2AO4tsATIOWHhXXerIciWuP5W8LikUmr4xXdQD7S1lbmH1sKvgyquPqyfjucQlP/efcoYXGQMp7tFs/1Z1RXPmq4oG3IZIy/wZOgiT8/wP/nCVOAahtAE1VxRldber286ruoF4e3GFjSxYafjyifaYwSvHySiKKqjVCaHw1oVv6bJn2H1sjuU19LSvDTZk+zMlWuxe1HW2dLtrGQGptd1JSURzmuc+stmrDBeiSGQ5QZza4+6TZKnSMNZ0RrjvTLlT+qW6OYMSPkiSDlEjkB47kIGQKQ== eli@AKVA9163"
       ];
     };
 
@@ -263,6 +279,43 @@
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQD0M91PbrPNi68wyQAsv+VWCSfGTLEALVu91O1b3p/pX45u4H2GzZ+I8KsXEWr/bkaH4OiZZHU+4oyrhSMvrquXTfPSBEkW9KXKGauAuQfvALhHenUbO7j25uyzq5MCiTtE7hmkPwNMqXhXkqqvbt8NC5qAyCf632iSJv6wDdAoW6gRocAJrqa1NMkdZ8gKAkUVVa8Wip3LUx00ybpoezH3YJTxwe3WNqy+WrNDVpzn7MgJaG0UIYqyFVPUbnvWEqzw0gHQWOFQoWe6vtlYME24rE5Sq+sCGwys+aJd5T5rUIITwcKfmS/4JJ27O6Sy8/qMJDnhDl+ROaQYFnVZjTjxvedt85Yplrl4CbKbObhwThZDs00BZ+31OLVh6/Di01SVxGkGzHNlJL0gTEN4t8VujbySzJkX4OKzlBYuzYQLKKnThQM7VUc95nYEEIbPE4MfWk3oBSpRRpqrCXYTjI0iV/JpdkSFjozX17Q7hNYVKfSpwzHaQXTWdQ/0eyEAeJs="
       ];
     };
+
+    yugaos = {
+      description = "Yuago Shen";
+      home = "/home/yugaos";
+      group = "yugaos";
+      extraGroups = [
+        "users"
+        "docker"
+      ];
+      uid = 1013;
+      isNormalUser = true;
+      createHome = true;
+      useDefaultShell = true;
+      # shell = pkgs.fish;
+      openssh.authorizedKeys.keys = [
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDatpj7SvijgKhVsuSrunxu7xDnFx6N7sQWDPoxMOu28HTVKuH9awZgw4Wcq7WYw9hlypHt6pVVm7cLq0eanJpB0rQKYNAt5DTs1T3Tf9n1ejWeNLkLaLem1NdHW6Lwag793/eFPtGljsYBug5taL8mtsjPQ9Yw5D/HaRC2fEK1TSvwGMyM9L0mArrEe8dFNrlaH3rqdPsfBNBGUO/ZKCbgsnk13lO2YtW2BPjhZUUbgpQ/KkpYvTYdYT/tp9JPEt55tzTyZgRkJfYdaoU699jQ9fsnLKWjYU88Z0iZfDL/8IFJ0hW6oJCSHa/5EZq2pM+8y25KkHa4EhPOqEWctsFd rsa-key-20210816"
+      ];
+    };
+
+    ata = {
+      description = "Anne Tårånd Aasen";
+      home = "/home/ata";
+      group = "ata";
+      extraGroups = [
+        "users"
+        "docker"
+      ];
+      uid = 1014;
+      isNormalUser = true;
+      createHome = true;
+      useDefaultShell = true;
+      # shell = pkgs.fish;
+      openssh.authorizedKeys.keys = [
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJDndk2/iDsj0dikNe4SugQDTeBWv90MHRRR8zNNXAKqECsIcAq4FuYsuckvvCtXaaeh6+UUuX2VnjQmbkq7pfiYsjS/wVsUHIxUo8kXX6+1OigDM+gXXcv9bbNRE/mBOmTg51vqTiceAOvzlqsvyt+jgAsja7C64UC74cy+cw1ecdYaYOKH7X5PSVdMowySHFjez2Iyn+akXTo+HHXTJGJFv1E4yPtEkEYUbNPntH8Aa3LehdF+Xo9sQBCM9Y+MRYx4fqG/6YkzycvXhdvfDeI04RkmqQZoqcO5kQ1FC3yYzz16uly0zyEWcNDaUztAgiF/DmEUM3VjxuX5Rajc5/ rsa-key-20210903"
+      ];
+    };
+
     # @usr@
   };