diff --git a/internal/app/wwctl/overlay/build/main.go b/internal/app/wwctl/overlay/build/main.go
index 2e987de7..fd10342c 100644
--- a/internal/app/wwctl/overlay/build/main.go
+++ b/internal/app/wwctl/overlay/build/main.go
@@ -64,7 +64,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	oldMask := syscall.Umask(007)
+	oldMask := syscall.Umask(000)
 	defer syscall.Umask(oldMask)
 
 	if len(OverlayNames) > 0 {
diff --git a/internal/app/wwctl/server/root.go b/internal/app/wwctl/server/root.go
index f805caba..de4ac47a 100644
--- a/internal/app/wwctl/server/root.go
+++ b/internal/app/wwctl/server/root.go
@@ -2,6 +2,7 @@ package server
 
 import (
 	"fmt"
+	"syscall"
 
 	"github.com/spf13/cobra"
 	"github.com/warewulf/warewulf/internal/pkg/warewulfd"
@@ -21,8 +22,14 @@ func GetCommand() *cobra.Command {
 }
 
 func CobraRunE(cmd *cobra.Command, args []string) error {
+	oldMask := syscall.Umask(000)
+	defer syscall.Umask(oldMask)
+
 	if err := warewulfd.DaemonInitLogging(); err != nil {
 		return fmt.Errorf("failed to configure logging: %w", err)
 	}
-	return fmt.Errorf("failed to start Warewulf server: %w", warewulfd.RunServer())
+	if err := warewulfd.RunServer(); err != nil {
+		return fmt.Errorf("failed to start Warewulf server: %w", err)
+	}
+	return nil
 }