diff --git a/overlays/host/internal/host_test.go b/overlays/host/internal/host_test.go
index 92aa7ce3..7fd16573 100644
--- a/overlays/host/internal/host_test.go
+++ b/overlays/host/internal/host_test.go
@@ -314,8 +314,8 @@ const host_exports string = `backupFile: true
 writeFile: true
 Filename: etc/exports
 # This file is autogenerated by warewulf
-/home 192.168.0.0/255.255.255.0(rw,sync)
-/opt 192.168.0.0/255.255.255.0(ro,sync,no_root_squash)
+/home 192.168.0.0/255.255.255.0(rw,sync) 2001:db8::/64(rw,sync)
+/opt 192.168.0.0/255.255.255.0(ro,sync,no_root_squash) 2001:db8::/64(ro,sync,no_root_squash)
 
 `
 
diff --git a/overlays/host/rootfs/etc/exports.ww b/overlays/host/rootfs/etc/exports.ww
index b8c44fff..d783829a 100644
--- a/overlays/host/rootfs/etc/exports.ww
+++ b/overlays/host/rootfs/etc/exports.ww
@@ -1,9 +1,8 @@
 {{ if .Nfs.Enabled -}}
 # This file is autogenerated by warewulf
-{{- $network := .Network }}
-{{- $netmask := .Netmask }}
 {{- range .Nfs.ExportsExtended }}
-{{ .Path }} {{ $network }}/{{ $netmask }}({{ .ExportOptions }})
+{{ .Path }} {{ $.Network }}/{{ $.Netmask }}({{ .ExportOptions }})
+  {{- if $.Ipv6 }} {{ $.NetworkCIDR6 }}({{ .ExportOptions }}){{ end }}
 {{- end }}
 {{- else }}
 {{ abort }}