diff --git a/hosts/storage-ng/configuration.nix b/hosts/storage-ng/configuration.nix
index 482eab14..4dd77311 100644
--- a/hosts/storage-ng/configuration.nix
+++ b/hosts/storage-ng/configuration.nix
@@ -4,7 +4,8 @@
 
 { config, pkgs, lib, strings, ... }:
 
-{
+let eth0 = "ens18";
+in {
   imports = [ # Include the results of the hardware scan.
     ./hardware-configuration.nix
     ../../lib
@@ -14,17 +15,18 @@
     ./ncdc.nix
     ../../lib/mpd.nix
     ../../lib/default-gateway.nix
+    ../../lib/emery.nix
   ];
 
   c3d2 = {
     isInHq = true;
     mapHqHosts = true;
-    hq.interface = "ens18";
+    hq.interface = eth0;
   };
 
   hq.yggdrasil = {
     enable = true;
-    interface = "ens18";
+    interface = eth0;
   };
 
   boot.loader.systemd-boot.enable = true;
@@ -33,16 +35,18 @@
   networking = {
     hostName = "storage-ng";
     # usePredictableInterfacenames = false;
-    interfaces.ens18.ipv4.addresses = [{
+    interfaces.${eth0} = {
+      ipv4.addresses = [{
       address = "172.22.99.20";
       prefixLength = 24;
     }];
-    interfaces.ens18.ipv6.addresses = [{
+    ipv6.addresses = [{
       address = "2a02:8106:208:5201::20";
       prefixLength = 64;
     }];
+    };
 
-    defaultGateway.interface = "ens18";
+    defaultGateway.interface = eth0;
 
   };