diff --git a/modules/build-types/pxe-boot.nix b/modules/build-types/pxe-boot.nix
index 8179adb..52a80dd 100644
--- a/modules/build-types/pxe-boot.nix
+++ b/modules/build-types/pxe-boot.nix
@@ -171,7 +171,7 @@ in
     tmpfiles.rules = [
       "d ${pxeRoot} 0755 root root -"
       "d ${httpRoot} 0755 root root -"
-      "L+ ${httpRoot}/images - - - - ${vars.nfsShares.proxmoxPxeImages.mountpoint}"
+      "L+ ${httpRoot}/images - - - - ${vars.nfsShares.pxebootImages.mountpoint}"
       "d ${httpRoot}/auto-installer 0755 root root -"
       "d ${httpRoot}/nixos-minimal 0755 root root -"
       "d ${httpRoot}/systemrescue 0755 root root -"
diff --git a/modules/build-types/server.nix b/modules/build-types/server.nix
index b4e55dc..53bc190 100644
--- a/modules/build-types/server.nix
+++ b/modules/build-types/server.nix
@@ -10,7 +10,8 @@ let
     in lib.imap1 (i: _: lib.concatStringsSep "/" (lib.take i parts)) parts;
 
   poolDatasets = lib.unique (
-    lib.concatMap (share: ancestors share.subpath) (lib.attrValues vars.nfsShares)
+    lib.concatMap (share: ancestors share.subpath)
+      (lib.filter builtins.isAttrs (lib.attrValues vars.nfsShares))
   );
 in
 {
@@ -84,7 +85,7 @@ in
       ${vars.storageRoot}/${vars.nfsShares.nextcloudData.subpath} ${vars.lanCidr}${vars.nfsShares.options}
       ${vars.storageRoot}/${vars.nfsShares.raspiVolumes.subpath} ${vars.lanCidr}${vars.nfsShares.options}
       ${vars.storageRoot}/${vars.nfsShares.proxmoxIsos.subpath} ${vars.lanCidr}${vars.nfsShares.options}
-      ${vars.storageRoot}/${vars.nfsShares.proxomoxLxcImages.subpath} ${vars.lanCidr}${vars.nfsShares.options}
+      ${vars.storageRoot}/${vars.nfsShares.proxmoxLxcImages.subpath} ${vars.lanCidr}${vars.nfsShares.options}
       ${vars.storageRoot}/${vars.nfsShares.pxebootImages.subpath} ${vars.lanCidr}${vars.nfsShares.options}
     '';
   };
diff --git a/modules/pxe-boot/mount-pxe-images.nix b/modules/pxe-boot/mount-pxe-images.nix
index 656562f..b3879c6 100644
--- a/modules/pxe-boot/mount-pxe-images.nix
+++ b/modules/pxe-boot/mount-pxe-images.nix
@@ -7,8 +7,8 @@ let
   nfsServer = "${vars.nfsServerHost}.${vars.homeDomain}";
 in
 {
-  fileSystems.${vars.nfsShares.proxmoxPxeImages.mountpoint} = {
-    device = "${nfsServer}:${vars.storageRoot}/${vars.nfsShares.proxmoxPxeImages.subpath}";
+  fileSystems.${vars.nfsShares.pxebootImages.mountpoint} = {
+    device = "${nfsServer}:${vars.storageRoot}/${vars.nfsShares.pxebootImages.subpath}";
     fsType = "nfs";
     options = [
       "_netdev"