diff --git a/krebs/2configs/ircd.nix b/krebs/2configs/ircd.nix
index b534f9ad4..962dbf49c 100644
--- a/krebs/2configs/ircd.nix
+++ b/krebs/2configs/ircd.nix
@@ -12,10 +12,10 @@
     '';
     config = ''
       serverinfo {
-        name = "${config.krebs.build.host.name}.irc.retiolum";
+        name = "${config.krebs.build.host.name}.irc.r";
         sid = "1as";
         description = "miep!";
-        network_name = "irc.retiolum";
+        network_name = "irc.r";
         hub = yes;
 
         vhost = "0.0.0.0";
diff --git a/krebs/3modules/nin/default.nix b/krebs/3modules/nin/default.nix
index 1a0999b8d..1531a2c89 100644
--- a/krebs/3modules/nin/default.nix
+++ b/krebs/3modules/nin/default.nix
@@ -14,7 +14,6 @@ with import <stockholm/lib>;
           ip4.addr = "10.243.132.96";
           ip6.addr = "42:0000:0000:0000:0000:0000:0000:2342";
           aliases = [
-            "hiawatha.retiolum"
             "hiawatha.r"
           ];
           tinc.pubkey = ''
@@ -39,7 +38,6 @@ with import <stockholm/lib>;
           ip4.addr = "10.243.134.66";
           ip6.addr = "42:0000:0000:0000:0000:0000:0000:1379";
           aliases = [
-            "axon.retiolum"
             "axon.r"
           ];
           tinc.pubkey = ''
@@ -80,10 +78,8 @@ with import <stockholm/lib>;
           ip4.addr = "10.243.132.55";
           ip6.addr = "42:0000:0000:0000:0000:0000:0000:1357";
           aliases = [
-            "onondaga.retiolum"
             "onondaga.r"
             "cgit.onondaga.r"
-            "cgit.onondaga.retiolum"
           ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
@@ -104,11 +100,11 @@ with import <stockholm/lib>;
   };
   users = {
     nin = {
-      mail = "nin@axon.retiolum";
+      mail = "nin@axon.r";
       pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl4jHl2dya9Tecot7AcHuk57FiPN0lo8eDa03WmTOCCU7gEJLgpi/zwLxY/K4eXsDgOt8LJwddicgruX2WgIYD3LnwtuN40/U9QqqdBIv/5sYZTcShAK2jyPj0vQJlVUpL7DLxxRH+t4lWeRw/1qaAAVt9jEVbzT5RH233E6+SbXxfnQDhDwOXwD1qfM10BOGh63iYz8/loXG1meb+pkv3HTf5/D7x+/y1XvWRPKuJ2Ml33p2pE3cTd+Tie1O8CREr45I9JOIOKUDQk1klFL5NNXnaQ9h1FRCsnQuoGztoBq8ed6XXL/b8mQ0lqJMxHIoCuDN/HBZYJ0z+1nh8X6XH nin@axon";
     };
     nin_h = {
-      mail = "nin@hiawatha.retiolum";
+      mail = "nin@hiawatha.r";
       pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDicZLUPEVNX7SgqYWcjPo0UESRizEfIvVVbiwa1aApA8x25u/5R3sevcgbIpLHYKDMl5tebny9inr6G2zqB6oq/pocQjHxrPnuLzqjvqeSpbjQjlNWJ9GaHT5koTXZHdkEXGL0vfv1SRDNWUiK0rNymr3GXab4DyrnRnuNl/G1UtLf4Zka94YUD0SSPdS9y6knnRrUWKjGMFBZEbNSgHqMGATPQP9VDwKHIO2OWGfiBAJ4nj/MWj+BxHDleCMY9zbym8yY7p/0PLaUe9eIyLC8MftJ5suuMmASlj+UGWgnqUxWxsMHax9y7CTAc23r1NNCXN5LC6/facGt0rEQrdrTizBgOA1FSHAPCl5f0DBEgWBrRuygEcAueuGWvI8/uvtvQQZLhosDbXEfs/3vm2xoYBe7wH4NZHm+d2LqgIcPXehH9hVQsl6pczngTCJt0Q/6tIMffjhDHeYf6xbe/n3AqFT0PylUSvOw/H5iHws3R6rxtgnOio7yTJ4sq0NMzXCtBY6LYPGnkwf0oKsgB8KavZVnxzF8B1TD4nNi0a7ma7bd1LMzI/oGE6i8kDMROgisIECOcoe8YYJZXIne/wimhhRKZAsd+VrKUo4SzNIavCruCodGAVh2vfrqRJD+HD/aWH7Vr1fCEexquaxeKpRtKGIPW9LRCcEsTilqpZdAiw== nin@hiawatha";
     };
   };
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index ce01be5f3..cc09313f7 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -122,6 +122,7 @@ with import <stockholm/lib>;
           cgit        60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
           cgit.ni     60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
           krebsco.de. 60 IN MX 5 ni
+          krebsco.de. 60 IN TXT v=spf1 mx -all
         '';
       };
       nets = {
diff --git a/lass/2configs/bepasty.nix b/lass/2configs/bepasty.nix
index 43647892f..9bd416c05 100644
--- a/lass/2configs/bepasty.nix
+++ b/lass/2configs/bepasty.nix
@@ -23,7 +23,10 @@ in {
     servers = {
       "paste.r" = {
         nginx = {
-          serverAliases = [ "paste.retiolum" "paste.${config.krebs.build.host.name}" ];
+          serverAliases = [
+            "paste.${config.krebs.build.host.name}"
+            "paste.r"
+          ];
         };
         defaultPermissions = "admin,list,create,read,delete";
         secretKey = secKey;
diff --git a/makefu/2configs/bepasty-dual.nix b/makefu/2configs/bepasty-dual.nix
index 701bf5b1d..890652285 100644
--- a/makefu/2configs/bepasty-dual.nix
+++ b/makefu/2configs/bepasty-dual.nix
@@ -28,7 +28,10 @@ in {
     servers = {
       "paste.r" = {
         nginx = {
-          serverAliases = [ "paste.retiolum" "paste.${config.krebs.build.host.name}" ];
+          serverAliases = [
+            "paste.${config.krebs.build.host.name}"
+            "paste.r"
+          ];
         };
         defaultPermissions = "admin,list,create,read,delete";
         secretKeyFile = secKey;
diff --git a/makefu/2configs/collectd/collectd-base.nix b/makefu/2configs/collectd/collectd-base.nix
index 91e5216ad..9168d1fa9 100644
--- a/makefu/2configs/collectd/collectd-base.nix
+++ b/makefu/2configs/collectd/collectd-base.nix
@@ -10,7 +10,7 @@ let
       ModulePath "${collectd-connect-time}/lib/${python.libPrefix}/site-packages/"
       Import "collectd_connect_time"
       <Module collectd_connect_time>
-        target "wry.retiolum" "localhost" "google.com"
+        target "wry.r" "localhost" "google.com"
         interval 30
       </Module>
     </Plugin>
@@ -19,7 +19,7 @@ let
     LoadPlugin write_graphite
     <Plugin "write_graphite">
       <Carbon>
-        Host "heidi.retiolum"
+        Host "heidi.r"
         Port "2003"
         Prefix "retiolum."
         EscapeCharacter "_"
diff --git a/makefu/2configs/nginx/euer.wiki.nix b/makefu/2configs/nginx/euer.wiki.nix
index ef2c17c63..08bc5659f 100644
--- a/makefu/2configs/nginx/euer.wiki.nix
+++ b/makefu/2configs/nginx/euer.wiki.nix
@@ -76,7 +76,7 @@ in {
     virtualHosts = {
       "${ext-dom}" = {
         #serverAliases = [
-        #  "wiki.makefu.retiolum"
+        #  "wiki.makefu.r"
         #  "wiki.makefu"
         #];
         forceSSL = true;
diff --git a/mv/source.nix b/mv/source.nix
index 2fa53a13e..5f6b2fe36 100644
--- a/mv/source.nix
+++ b/mv/source.nix
@@ -10,7 +10,7 @@ in
       nixos-config.symlink = "stockholm/mv/1systems/${name}/config.nix";
       nixpkgs.git = {
         # nixos-17.09
-        ref = mkDefault "d0f0657ca06cc8cb239cb94f430b53bcdf755887";
+        ref = mkDefault "0653b73bf61f3a23d28c38ab7e9c69a318d433de";
         url = https://github.com/NixOS/nixpkgs;
       };
       secrets.file = getAttr builder {