diff --git a/cli/email_alias.go b/cli/email_alias.go
index 04c2a0c5..a51e2a05 100644
--- a/cli/email_alias.go
+++ b/cli/email_alias.go
@@ -43,7 +43,7 @@ func addEmailAlias(gitFs *GitFS, to, fromDomain string) (string, error) {
 	newContents := getAddedAliasContents(string(fileContentsBytes), aliasEmail, to)
 
 	// Write new contents
-	fWrite, err := (*gitFs.fs).OpenFile(emailAliasesConfigFileRelative, os.O_WRONLY, 0644)
+	fWrite, err := (*gitFs.fs).OpenFile(emailAliasesConfigFileRelative, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
 	if err != nil {
 		return "", errors.Wrapf(err, "failed to open file where new email alias will be added")
 	}
@@ -77,5 +77,5 @@ func getAddedAliasContents(currentContents, from, to string) string {
 		}
 	}
 	newLines = append(newLines, getPostFixAlias(from, to))
-	return strings.Join(newLines, "\n")
+	return strings.Join(newLines, "\n") + "\n"
 }
diff --git a/modules/kubernetes/mailserver/extra/aliases.txt b/modules/kubernetes/mailserver/extra/aliases.txt
index 53305d53..caa26064 100644
--- a/modules/kubernetes/mailserver/extra/aliases.txt
+++ b/modules/kubernetes/mailserver/extra/aliases.txt
@@ -1 +1 @@
-increasingly-gudrun-generated@viktorbarzin.me me@viktorbarzin.me
\ No newline at end of file
+# Add aliases here. Example: 'test@viktorbarzin.me me@viktorbarzin.me' will point test@ -> me@