diff --git a/clusters/stokes/default.nix b/clusters/stokes/default.nix
index 48ee48c..a4b393a 100644
--- a/clusters/stokes/default.nix
+++ b/clusters/stokes/default.nix
@@ -9,6 +9,7 @@ let
         nfs.enable = true;
         nfs.exports = ''
           /exports 10.1.61.0/24(insecure,rw,sync,no_subtree_check,crossmnt,fsid=0,no_root_squash)
+          /exports 10.1.63.0/24(insecure,rw,sync,no_subtree_check,crossmnt,fsid=0,no_root_squash)
         '';
       };
 
@@ -106,6 +107,10 @@ let
         device = "/opt";
         options = [ "bind" ];
       };
+      "/data" = {
+        device = "10.1.63.80:/data";
+        fsType = "nfs";
+      };
     };
 
     security.pam.services.sshd.googleAuthenticator.enable = true;
@@ -145,12 +150,16 @@ let
     };
 
     fileSystems = {
-      "/home" = {
-        device = "10.1.61.100:/home";
+      "/home/stokes" = {
+        device = "10.1.63.100:/home";
         fsType = "nfs";
       };
       "/opt" = {
-        device = "10.1.61.100:/opt";
+        device = "10.1.63.100:/opt";
+        fsType = "nfs";
+      };
+      "/data" = {
+        device = "10.1.63.80:/data";
         fsType = "nfs";
       };
     };
diff --git a/clusters/stokes/users.nix b/clusters/stokes/users.nix
index 678c619..f960a4b 100644
--- a/clusters/stokes/users.nix
+++ b/clusters/stokes/users.nix
@@ -13,6 +13,7 @@
     eli = { gid = 1008; };
     ovanov = { gid = 1009; };
     bast = { gid = 1010; };
+    marius = { gid = 1011; };
     # @grp@
 
     sif = {
@@ -25,6 +26,7 @@
         "hes"
         "hdj002"
         "mad"
+        "marius"
         "eli"
         "ovanov"
         "peyghamg"
@@ -207,6 +209,8 @@
       extraGroups = [
         "users"
         "docker"
+        "wheel"
+        "root"
       ];
       uid = 1010;
       isNormalUser = true;
@@ -218,6 +222,24 @@
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIdcJteh9d/N1o8BbdEMRVxeMjm28saon/Oh2tV0+TYj"
       ];
     };
+
+    marius = {
+      description = "Marius Indreberg";
+      home = "/home/marius";
+      group = "marius";
+      extraGroups = [
+        "users"
+        "docker"
+      ];
+      uid = 1011;
+      isNormalUser = true;
+      createHome = true;
+      useDefaultShell = false;
+      shell = pkgs.fish;
+      openssh.authorizedKeys.keys = [
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC8Q96rG6C8oX1fjW32yX0bPC3MOz2A6rUCPpoA5KqL0psJvA1ielUupBgo2uBlHG8UHOit5Ui23JVm4t/k7Czv0vbZ+Vx2qk52H1A+KKZByBWgEo+o+PpXZVNEfn6jQvVTOwSDSxTIO8UIMdFIfHjbYlpBN9JobK4b9OH3CUnnuqBxHtkef6dzy9XIDL8dX7HXK4/UcfoMy07gB/p/9Ij8i8CMlH7tX1IFJ7rICz2qsW5iSMpqOnClhyBYlm5VQ3OskLgTnTfBbNCTGkxuQlRpucqxW0J9Bas083N3TFWWhSHqnxTYlYmwAs+f07nIJpgOMYOPvHWIuiG1QvzIC2me/Hi0bbKd47HRwtLe0cMFItixv4ex9vvc8TOYwxruODnzAoeNT+Wn6MOEu44PXk5LezmGPhWLX0oaNNkiEFv4XQ4walZVJgiPmmLWgh0jit+D4omXlbUL8tHua5Ep+5InCOF4h8fisLXiJnzVkIo3teHJohXWs5ZkzowXHl4EmIDUlkEyVocFRodYmqkPDQWLb8pmWNbA5HIB9g/7Px1+8brTyhBcH80BRSmLfRR0nXPEwFupjuqfEQPgrRCT45QBA80OlmTMWcwO4fwZOeP+VPLalot7SHyjIivWb3LjLlasAU8w7QZbYa9MGoufVgOSsIi4Pgcwv+jK2cACWR24AQ== marius.indreberg@itpartner.no"
+      ];
+    };
     # @usr@
   };