diff --git a/containers/amethyst/flake.nix b/containers/amethyst/flake.nix
index ff70120..4865e29 100644
--- a/containers/amethyst/flake.nix
+++ b/containers/amethyst/flake.nix
@@ -14,10 +14,10 @@
       networking.nat = {
         enable = true;
         enableIPv6 = true;
-        internalInterfaces = [ "ve-+" ];
+        internalInterfaces = [ "ve-${name}" ];
       };
 
-      services.nginx.virtualHosts."amethyst.local.lava.moe" = {
+      services.nginx.virtualHosts."${name}.local.lava.moe" = {
         useACMEHost = "lava.moe";
         forceSSL = true;
         locations."/".proxyPass = "http://[fd0d:1::${subnet}:2]:9091";
diff --git a/containers/beryllium/flake.nix b/containers/beryllium/flake.nix
index 46d3428..adab4f0 100644
--- a/containers/beryllium/flake.nix
+++ b/containers/beryllium/flake.nix
@@ -14,10 +14,10 @@
       networking.nat = {
         enable = true;
         enableIPv6 = true;
-        internalInterfaces = [ "ve-+" ];
+        internalInterfaces = [ "ve-${name}" ];
       };
 
-      services.nginx.virtualHosts."beryllium.lava.moe" = {
+      services.nginx.virtualHosts."${name}.lava.moe" = {
         useACMEHost = "lava.moe";
         forceSSL = true;
         locations."/".extraConfig = "return 302 'https://lava.moe';";