diff --git a/pkg/passwd/passwd.go b/pkg/passwd/passwd.go
index f8179e86bd..cce8817260 100644
--- a/pkg/passwd/passwd.go
+++ b/pkg/passwd/passwd.go
@@ -133,17 +133,21 @@ func (p *Passwd) Write(passwdFile string) error {
 }
 
 func writePasswords(passwdFile string, records [][]string) error {
-	out, err := os.Create(passwdFile + ".tmp")
-	if err != nil {
-		return err
-	}
-	defer out.Close()
+	err := func() error {
+		// ensure to close tmp file before rename for filesystems like NTFS
+		out, err := os.Create(passwdFile + ".tmp")
+		if err != nil {
+			return err
+		}
+		defer out.Close()
 
-	if err := out.Chmod(0600); err != nil {
-		return err
-	}
+		if err := out.Chmod(0600); err != nil {
+			return err
+		}
 
-	if err := csv.NewWriter(out).WriteAll(records); err != nil {
+		return csv.NewWriter(out).WriteAll(records)
+	}()
+	if err != nil {
 		return err
 	}