diff --git a/modules/clan/phonebox/default.nix b/modules/clan/phonebox/default.nix
index aa4fa39..37780b1 100644
--- a/modules/clan/phonebox/default.nix
+++ b/modules/clan/phonebox/default.nix
@@ -240,7 +240,12 @@
                   "extensions.conf" =
                     let
                       serverConf = builtins.foldl' (
-                        config: node: config ++ (genExtentConf node.prefixNumber node.hostname)
+                        config: node:
+                        config
+                        ++ (genExtentConf {
+                          prefixNumber = node.prefixNumber;
+                          hostname = node.hostname;
+                        })
                       ) "" nodes;
                     in
                     ''
@@ -250,7 +255,9 @@
                       same  =>     n,Hangup()
 
                     ''
-                    + (genLocalExtenConf config.clan.core.vars.generators.phonebox.files.ata-local-number.value)
+                    + (genLocalExtenConf {
+                      localNumber = config.clan.core.vars.generators.phonebox.files.ata-local-number.value;
+                    })
                     + serverConf;
 
                   "rtp.conf" = ''
@@ -262,7 +269,12 @@
                   "pjsip.conf" =
                     let
                       serverConf = builtins.foldl' (
-                        conf: node: conf ++ (genServerSIPEndpoint node.hostname node.address)
+                        conf: node:
+                        conf
+                        ++ (genServerSIPEndpoint {
+                          hostname = node.hostname;
+                          address = node.address;
+                        })
                       ) "" nodes;
                     in
                     ''
@@ -296,7 +308,9 @@
                       type=aor
 
                     ''
-                    + (genLocalSIPEndpoint config.clan.core.vars.generators.phonebox.files.ata-local-number)
+                    + (genLocalSIPEndpoint {
+                      localNumber = config.clan.core.vars.generators.phonebox.files.ata-local-number;
+                    })
                     + serverConf;
                 };
             };