diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 17312c6bd8..e88327b779 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   app:
-    build: 
+    build:
       context: .
       dockerfile: Dockerfile
       args:
@@ -18,7 +18,7 @@ services:
 
     volumes:
       - ..:/workspace:cached
-      
+
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
 
@@ -28,7 +28,7 @@ services:
     # Uncomment the next line to use a non-root user for all processes.
     # user: vscode
 
-    # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. 
+    # Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
     # (Adding the "ports" property to this file will not forward from a Codespace.)
 
     # DotNetCore ENV Variables
@@ -41,7 +41,7 @@ services:
     - Umbraco__CMS__Unattended__UnattendedUserPassword=password1234
     - Umbraco__CMS__Global__Smtp__Host=smtp4dev
     - Umbraco__CMS__Global__Smtp__Port=25
-    - Umbraco__CMS__Global__Smtp__From=warren-env@umbraco.com
+    - Umbraco__CMS__Global__Smtp__From=noreply@umbraco.test
 
   db:
     image: mcr.microsoft.com/mssql/server:2019-latest
diff --git a/.gitattributes b/.gitattributes
index 3241b6511c..8ac58cf5fe 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
+* text=auto
 *.doc  diff=astextplain
 *.DOC	diff=astextplain
 *.docx	diff=astextplain
@@ -44,6 +45,7 @@
 *.json text=auto
 *.xml text=auto
 *.resx text=auto
+*.yml text eol=lf core.whitespace whitespace=tab-in-indent,trailing-space,tabwidth=2
 
 *.csproj text=auto merge=union
 *.vbproj text=auto merge=union