diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0171e217ea..7c86b15042 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,17 +86,21 @@ blade-torres:
   extends: .deploy
   script: './hack/deploy.sh "blade-torres" ""'
 
-las01-frantech:
+bvm-nixosmgmt:
   extends: .deploy
-  script: './hack/deploy.sh "las01-frantech" ""'
+  script: './hack/deploy.sh "bvm-nixosmgmt" ""'
 
-lux01-frantech:
+frantech-las01:
   extends: .deploy
-  script: './hack/deploy.sh "lux01-frantech" ""'
+  script: './hack/deploy.sh "frantech-las01" ""'
 
-nyc01-frantech:
+frantech-lux01:
   extends: .deploy
-  script: './hack/deploy.sh "nyc01-frantech" ""'
+  script: './hack/deploy.sh "frantech-lux01" ""'
+
+frantech-nyc01:
+  extends: .deploy
+  script: './hack/deploy.sh "frantech-nyc01" ""'
 
 docker-push:
   stage: deploy
diff --git a/ops/nixos/nixos-mgmt/default.nix b/ops/nixos/bvm-nixosmgmt/default.nix
similarity index 97%
rename from ops/nixos/nixos-mgmt/default.nix
rename to ops/nixos/bvm-nixosmgmt/default.nix
index 7234c0c47e..b002bd99ef 100644
--- a/ops/nixos/nixos-mgmt/default.nix
+++ b/ops/nixos/bvm-nixosmgmt/default.nix
@@ -37,7 +37,7 @@ in {
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  nix.maxJobs = lib.mkDefault 1;
+  nix.maxJobs = lib.mkDefault 2;
 
   # Networking!
   networking = {
diff --git a/ops/nixos/default.nix b/ops/nixos/default.nix
index a867b644d5..97e21dbfd3 100644
--- a/ops/nixos/default.nix
+++ b/ops/nixos/default.nix
@@ -30,10 +30,10 @@ let
     "blade-torres"
     "blade-chakotay"
     "blade-kim"
-    "lux01-frantech"
-    "nyc01-frantech"
-    "las01-frantech"
-    "nixos-mgmt"
+    "frantech-lux01"
+    "frantech-nyc01"
+    "frantech-las01"
+    "bvm-nixosmgmt"
   ];
   rebuilder = system: (import ./lib/rebuilder.nix (args // { system = system; }));
   systemCfgs = lib.genAttrs systems
diff --git a/ops/nixos/las01-frantech/README.md b/ops/nixos/frantech-las01/README.md
similarity index 88%
rename from ops/nixos/las01-frantech/README.md
rename to ops/nixos/frantech-las01/README.md
index f01a2c4d4d..155ca2aa20 100644
--- a/ops/nixos/las01-frantech/README.md
+++ b/ops/nixos/frantech-las01/README.md
@@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2020 Luke Granger-Brown <depot@lukegb.com>
 SPDX-License-Identifier: Apache-2.0
 -->
 
-# las01-frantech.as205479.net
+# frantech-las01.as205479.net
 
 1GiB RAM VM from BuyVM.
 
diff --git a/ops/nixos/las01-frantech/default.nix b/ops/nixos/frantech-las01/default.nix
similarity index 97%
rename from ops/nixos/las01-frantech/default.nix
rename to ops/nixos/frantech-las01/default.nix
index 25cb5f3ad9..887c3749dd 100644
--- a/ops/nixos/las01-frantech/default.nix
+++ b/ops/nixos/frantech-las01/default.nix
@@ -40,7 +40,7 @@ in {
 
   # Networking!
   networking = {
-    hostName = "las01-frantech";
+    hostName = "frantech-las01";
     domain = "as205479.net";
     hostId = "2b6a8f37";
 
diff --git a/ops/nixos/lux01-frantech/README.md b/ops/nixos/frantech-lux01/README.md
similarity index 88%
rename from ops/nixos/lux01-frantech/README.md
rename to ops/nixos/frantech-lux01/README.md
index caaf73e679..2c9b5b20dd 100644
--- a/ops/nixos/lux01-frantech/README.md
+++ b/ops/nixos/frantech-lux01/README.md
@@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2020 Luke Granger-Brown <depot@lukegb.com>
 SPDX-License-Identifier: Apache-2.0
 -->
 
-# lux01-frantech.as205479.net
+# frantech-lux01.as205479.net
 
 1GiB RAM VM from BuyVM.
 
diff --git a/ops/nixos/lux01-frantech/default.nix b/ops/nixos/frantech-lux01/default.nix
similarity index 97%
rename from ops/nixos/lux01-frantech/default.nix
rename to ops/nixos/frantech-lux01/default.nix
index 86b1aea47e..8688642ef6 100644
--- a/ops/nixos/lux01-frantech/default.nix
+++ b/ops/nixos/frantech-lux01/default.nix
@@ -40,7 +40,7 @@ in {
 
   # Networking!
   networking = {
-    hostName = "lux01-frantech";
+    hostName = "frantech-lux01";
     domain = "as205479.net";
     hostId = "92a60220";
 
diff --git a/ops/nixos/nyc01-frantech/README.md b/ops/nixos/frantech-nyc01/README.md
similarity index 88%
rename from ops/nixos/nyc01-frantech/README.md
rename to ops/nixos/frantech-nyc01/README.md
index 361ac42159..e5d53c0397 100644
--- a/ops/nixos/nyc01-frantech/README.md
+++ b/ops/nixos/frantech-nyc01/README.md
@@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2020 Luke Granger-Brown <depot@lukegb.com>
 SPDX-License-Identifier: Apache-2.0
 -->
 
-# nyc01-frantech.as205479.net
+# frantech-nyc01.as205479.net
 
 1GiB RAM VM from BuyVM.
 
diff --git a/ops/nixos/nyc01-frantech/default.nix b/ops/nixos/frantech-nyc01/default.nix
similarity index 97%
rename from ops/nixos/nyc01-frantech/default.nix
rename to ops/nixos/frantech-nyc01/default.nix
index ef4bfdc1a5..9d8f3ace46 100644
--- a/ops/nixos/nyc01-frantech/default.nix
+++ b/ops/nixos/frantech-nyc01/default.nix
@@ -40,7 +40,7 @@ in {
 
   # Networking!
   networking = {
-    hostName = "nyc01-frantech";
+    hostName = "frantech-nyc01";
     domain = "as205479.net";
     hostId = "251837df";
 
diff --git a/ops/nixos/lib/coredns/zones/db.as205479.net b/ops/nixos/lib/coredns/zones/db.as205479.net
index f09f1b4634..2cd77416af 100644
--- a/ops/nixos/lib/coredns/zones/db.as205479.net
+++ b/ops/nixos/lib/coredns/zones/db.as205479.net
@@ -53,6 +53,8 @@ blade-kim.int       3600 IN A    100.84.36.62
 blade-janeway.int   3600 IN A    100.121.116.85
 blade-chakotay.int  3600 IN A    100.121.11.7
 
+bvm-nixosmgmt.int   3600 IN A    100.65.226.19
+
 ; laptops, desktops, routers
 totoro.int          3600 IN A    100.122.86.11
 porcorosso-win.int  3600 IN A    100.93.164.79