diff --git a/newinfra/nix/deploy/smoke-tests.sh b/newinfra/nix/deploy/smoke-tests.sh
index 4882a2b..fd76cdb 100755
--- a/newinfra/nix/deploy/smoke-tests.sh
+++ b/newinfra/nix/deploy/smoke-tests.sh
@@ -8,8 +8,12 @@ set -eux
 dig @dns1.infra.noratrieb.dev dns1.infra.noratrieb.dev +noall +answer | grep 154.38.163.74
 dig @dns2.infra.noratrieb.dev dns1.infra.noratrieb.dev +noall +answer | grep 154.38.163.74
 
-dig @dns1.infra.noratrieb.dev nilstrieb.dev +noall +answer | grep 185.199.108.153
-dig @dns2.infra.noratrieb.dev nilstrieb.dev +noall +answer | grep 185.199.108.153
+dig @dns1.infra.noratrieb.dev nilstrieb.dev +noall +answer | grep 161.97.165.1
+dig @dns2.infra.noratrieb.dev nilstrieb.dev +noall +answer | grep 161.97.165.1
 
 # Check HTTP responses
-curl --fail https://vps1.infra.noratrieb.dev
+curl --fail -s https://vps1.infra.noratrieb.dev -o /dev/null
+curl --fail -s https://vps3.infra.noratrieb.dev -o /dev/null
+curl --fail -s https://vps4.infra.noratrieb.dev -o /dev/null
+curl --fail -s https://vps5.infra.noratrieb.dev -o /dev/null
+curl --fail -s https://noratrieb.dev -o /dev/null
diff --git a/newinfra/nix/hive.nix b/newinfra/nix/hive.nix
index ff3e1e0..d4142d1 100644
--- a/newinfra/nix/hive.nix
+++ b/newinfra/nix/hive.nix
@@ -8,6 +8,10 @@
     nixpkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/a1cc729dcbc31d9b0d11d86dc7436163548a9665.tar.gz"); # nixos-24.05 2024-07-26
 
     specialArgs = {
+      website = import (fetchTarball "https://github.com/Noratrieb/website/archive/8751a926d108288c370414ee6add78cb9058c29a.tar.gz");
+      blog = fetchTarball "https://github.com/Noratrieb/nilstrieb.github.io/archive/d2e858ddca7e59c9d9c843f7273ff0f75d65421e.tar.gz";
+      slides = fetchTarball "https://github.com/Noratrieb/slides/archive/0401f35c22b124b69447655f0c537badae9e223c.tar.gz";
+
       networkingConfig = {
         dns1 = {
           publicIPv4 = "154.38.163.74";
diff --git a/newinfra/nix/modules/dns/nilstrieb.dev.nix b/newinfra/nix/modules/dns/nilstrieb.dev.nix
index 2481a3f..b3c9adf 100644
--- a/newinfra/nix/modules/dns/nilstrieb.dev.nix
+++ b/newinfra/nix/modules/dns/nilstrieb.dev.nix
@@ -14,7 +14,8 @@ let
       };
     in
     with hostsToDns;
-    {
+    # point nilstrieb.dev to vps1
+    vps1 // {
       SOA = {
         nameServer = "ns1.nilstrieb.dev";
         adminEmail = "void@noratrieb.dev";
@@ -31,21 +32,6 @@ let
         "ns2.nilstrieb.dev"
       ];
 
-      A = map (ttl hour1) [
-        # GH Pages
-        (a "185.199.108.153")
-        (a "185.199.109.153")
-        (a "185.199.110.153")
-        (a "185.199.111.153")
-      ];
-      AAAA = map (ttl hour1) [
-        # GH Pages
-        (aaaa "2606:50c0:8002:0:0:0:0:153")
-        (aaaa "2606:50c0:8003:0:0:0:0:153")
-        (aaaa "2606:50c0:8000:0:0:0:0:153")
-        (aaaa "2606:50c0:8001:0:0:0:0:153")
-      ];
-
       MX = with mx; [
         (mx 10 "mail.protonmail.ch")
         (mx 20 "mailsec.protonmail.ch")
@@ -56,7 +42,7 @@ let
         ns2 = dns2;
 
         www = vps2;
-        blog.CNAME = map (ttl hour1) [ (cname "nilstrieb.github.io") ];
+        blog = vps1;
 
         # apps
         bisect-rustc = vps2;
diff --git a/newinfra/nix/modules/dns/noratrieb.dev.nix b/newinfra/nix/modules/dns/noratrieb.dev.nix
index 553eba1..ae180ae 100644
--- a/newinfra/nix/modules/dns/noratrieb.dev.nix
+++ b/newinfra/nix/modules/dns/noratrieb.dev.nix
@@ -28,6 +28,8 @@ let
         ns1 = dns1;
         ns2 = dns2;
 
+        blog.CNAME = map (ttl hour1) [ (cname "noratrieb.github.io") ];
+
         www.CNAME = [ (cname "noratrieb.dev") ];
         pronouns.TXT = [
           "she/her"
diff --git a/newinfra/nix/modules/ingress/default.nix b/newinfra/nix/modules/ingress/default.nix
index 68fed21..3173393 100644
--- a/newinfra/nix/modules/ingress/default.nix
+++ b/newinfra/nix/modules/ingress/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, name, ... }: {
+{ pkgs, config, name, website, slides, blog, ... }: {
   networking.firewall.allowedTCPPorts = [
     443
   ];
@@ -17,8 +17,16 @@
           ${
             if name == "vps1" then
             ''
+              nilstrieb.dev {
+                redir https://noratrieb.dev{uri} permanent
+              }
+
+              blog.nilstrieb.dev {
+                redir https://blog.noratrieb.dev{uri} permanent
+              }
+
               noratrieb.dev {
-                root * ${./nora}
+                root * ${website {inherit pkgs slides blog;}}
                 file_server
               }
             '' else ""
diff --git a/newinfra/nix/modules/ingress/nora/index.html b/newinfra/nix/modules/ingress/nora/index.html
deleted file mode 100644
index 45e10a0..0000000
--- a/newinfra/nix/modules/ingress/nora/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>nora</title>
-    <link rel="stylesheet" href="theme.css" />
-  </head>
-  <body class="overflow-hidden">
-    <div class="main-content">
-      <div class="main-content-inner">
-        <h1>nora's website</h1>
-        <div>
-        <p>hey, I'm nora (she/her?)! i think. maybe. who knows, really</p>
-        <p>this is here because i still havent managed move over <a href="https://nilstrieb.dev">nilstrieb.dev</a>, lol.</p>
-        <img width="100%" src="nora.png">
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/newinfra/nix/modules/ingress/nora/nora.png b/newinfra/nix/modules/ingress/nora/nora.png
deleted file mode 100644
index 7992d62..0000000
Binary files a/newinfra/nix/modules/ingress/nora/nora.png and /dev/null differ
diff --git a/newinfra/nix/modules/ingress/nora/theme.css b/newinfra/nix/modules/ingress/nora/theme.css
deleted file mode 100644
index eacb6b0..0000000
--- a/newinfra/nix/modules/ingress/nora/theme.css
+++ /dev/null
@@ -1,70 +0,0 @@
-body {
-  font-family: Verdana, sans-serif;
-  background-color: #e6dae9;
-  color: #1b191c;
-}
-
-.main-content {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-@media (min-width: 700px) {
-  .main-content-inner {
-    width: 70vw;
-  }
-}
-
-@media (min-width: 1200px) {
-  .main-content-inner {
-    width: 50vw;
-  }
-}
-
-.call-to-action {
-  width: 250px;
-  height: 50px;
-  background-color: #8c499d;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  cursor: pointer;
-  text-decoration: none;
-}
-
-@media (min-width: 1000px) {
-  .call-to-action {
-    width: 400px;
-  }
-}
-
-.call-to-action:hover {
-  background-color: #ac78b8;
-}
-
-.call-to-action * {
-  color: white;
-}
-
-@media (prefers-color-scheme: light) {
-  body {
-    background-color: #e6dae9;
-    color: #1b191c;
-  }
-
-  .secret {
-    color: #5b4561;
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-  body {
-    background-color: #1b191c;
-    color: #e6dae9;
-  }
-
-  .secret {
-    color: #a081a9;
-  }
-}