diff --git a/ekman/hive.nix b/ekman/hive.nix
index ce71b2a..e674d76 100644
--- a/ekman/hive.nix
+++ b/ekman/hive.nix
@@ -6,7 +6,7 @@ let
   # }) {};
   pkgs = import <nixpkgs> {};
 
-  manage = {
+  ekman-manage = {
       deployment = {
           tags = [ "manage" "ekman" ];
           allowLocalDeployment = true;
@@ -22,4 +22,4 @@ let
   fs-work = import ./fs-work { inherit pkgs; };
   fs-backup = import ./fs-backup { inherit pkgs; };
 in
-    { inherit manage; } // login // c0 // c0x // c1 // fs-work // fs-backup
+    { inherit ekman-manage; } // login // c0 // c0x // c1 // fs-work // fs-backup
diff --git a/rossby/c0/default.nix b/rossby/c0/default.nix
index e5e0519..2c75392 100644
--- a/rossby/c0/default.nix
+++ b/rossby/c0/default.nix
@@ -10,7 +10,7 @@ let
   nodes = import ./nodes.nix;
 
   compute = {
-    deployment.tags = [ "compute" "c0" ];
+    deployment.tags = [ "compute" "c0" "cluster" ];
 
     fileSystems = {
       "/users" = {
diff --git a/rossby/default.nix b/rossby/default.nix
index a322082..01d66b6 100644
--- a/rossby/default.nix
+++ b/rossby/default.nix
@@ -99,11 +99,7 @@ let
 
     networking = {
       domain = mkDefault "cluster.local";
-<<<<<<<< HEAD:rossby/default.nix
       defaultGateway = mkDefault "172.16.239.1";
-========
-      defaultGateway = mkDefault "10.255.241.1";
->>>>>>>> ekman:ekman/default.nix
       nameservers = mkDefault [ "8.8.8.8" ];
       search = mkDefault [];
       extraHosts = import ./hosts.nix;
@@ -152,6 +148,7 @@ let
         controlMachine = "rossby-manage";
         mailDomain = "oceanbox.io";
         nodeName = [
+<<<<<<< HEAD
           "c0-[1-16] Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN"
           "rossby-login Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN"
           "rossby-manage Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN"
@@ -164,13 +161,18 @@ let
           "ekman Sockets=2 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=256000 TmpDisk=500000 State=UNKNOWN"
           "ekman-manage Sockets=2 CoresPerSocket=16 ThreadsPerCore=2 RealMemory=92000 TmpDisk=200000 State=UNKNOWN"
 >>>>>>>> ekman:ekman/default.nix
+=======
+          "c0-[1-20] Sockets=2 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=350000 TmpDisk=400000 State=UNKNOWN"
+          "rossby-login Sockets=1 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=60000 TmpDisk=400000 State=UNKNOWN"
+          "rossby-manage Sockets=1 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=60000 TmpDisk=400000 State=UNKNOWN"
+>>>>>>> origin/rossby
         ];
         partitionName = [
-          "batch Nodes=c0-[1-16] Default=YES MaxTime=INFINITE State=UP"
+          "batch Nodes=c0-[1-20] Default=YES MaxTime=INFINITE State=UP"
           "rossby Nodes=rossby-login MaxTime=1:00:00 State=UP"
-          "short Nodes=c0-[1-8] MaxTime=INFINITE State=UP"
-          "long Nodes=c0-[3-8] MaxTime=INFINITE State=UP"
-          "stats Nodes=c0-[7-8] MaxTime=INFINITE State=UP"
+          "short Nodes=c0-[1-10] MaxTime=INFINITE State=UP"
+          "long Nodes=c0-[11-12] MaxTime=INFINITE State=UP"
+          "stats Nodes=c0-[19-20] MaxTime=INFINITE State=UP"
         ];
     };
   };
diff --git a/rossby/fs-work/default.nix b/rossby/fs-work/default.nix
index 42ec4ca..5566de1 100644
--- a/rossby/fs-work/default.nix
+++ b/rossby/fs-work/default.nix
@@ -11,7 +11,7 @@ let
   address = "10.255.241.90";
 in {
   fs-work = { config, pkgs, ... }: with pkgs; {
-    deployment.tags = [ "fs" "fs-work" ];
+    deployment.tags = [ "fs" "fs-work" "cluster" ];
     deployment.targetHost = address;
     system.autoUpgrade.enable = lib.mkForce false;
 
diff --git a/rossby/hive.nix b/rossby/hive.nix
index b74abfe..165cf6a 100644
--- a/rossby/hive.nix
+++ b/rossby/hive.nix
@@ -8,15 +8,15 @@ let
 
   rossby-manage = {
       deployment = {
-          tags = [ "manage" "login" ];
+          tags = [ "manage" "login" "cluster" ];
           allowLocalDeployment = true;
           targetHost = null;
       };
       imports = [ ./manage ];
   };
 
-  rossby-login = import ./login { inherit pkgs; };
+  login = import ./login { inherit pkgs; };
   c0 = import ./c0 { inherit pkgs; };
   fs-work = import ./fs-work { inherit pkgs; };
 in
-    { inherit rossby-manage; } // rossby-login // c0 // fs-work
+    { inherit rossby-manage; } // login // c0 // fs-work
diff --git a/rossby/login/default.nix b/rossby/login/default.nix
index 94baae8..3ac4878 100644
--- a/rossby/login/default.nix
+++ b/rossby/login/default.nix
@@ -6,7 +6,7 @@ let
 in
 {
   rossby-login = { config, pkgs, ... }: with pkgs; {
-    deployment.tags = [ "rossby-login" "login"  ];
+    deployment.tags = [ "login" "cluster" ];
     deployment.targetHost = address;
     system.autoUpgrade.enable = lib.mkForce false;
 
diff --git a/rossby/manage/default.nix b/rossby/manage/default.nix
index 7974329..b1b8253 100644
--- a/rossby/manage/default.nix
+++ b/rossby/manage/default.nix
@@ -5,7 +5,7 @@ let
       [
          rec {
            idx = 222;
-           name = "rossby-login";
+           name = "rossby";
            address = "172.16.239.${toString idx}";
            ipoib = "172.16.240.${toString idx}";
            pubkey = ../login/ssh_host_key.pub;