diff --git a/templates/.env.erb b/templates/.env.erb
index 0726abe..0cde07f 100644
--- a/templates/.env.erb
+++ b/templates/.env.erb
@@ -41,12 +41,12 @@ SESSION_COOKIE_DOMAIN=<%= @session_cookie_domain %>
 SESSION_COOKIE_SECURE=<%= @session_cookie_secure %>
 SESSION_COOKIE_HTTP_ONLY=<%= @session_cookie_http_only %>
 
-MAIL_DRIVER=<%= @email_driver %>
-MAIL_HOST=<%= @email_smtp_server %>
+MAIL_DRIVER="<%= @email_driver %>"
+MAIL_HOST="<%= @email_smtp_server %>"
 MAIL_PORT=<%= @email_smtp_server_port %>
 MAIL_USERNAME="<%= @email_smtp_server_user %>"
 MAIL_PASSWORD="<%= @email_smtp_server_password %>"
-SENDGRID_API_KEY=<%= @email_send_grid_api_key %>
+SENDGRID_API_KEY="<%= @email_send_grid_api_key %>"
 
 CORS_ALLOWED_HEADERS="origin, content-type, accept, authorization, x-requested-with"
 CORS_ALLOWED_METHODS="GET, POST, OPTIONS, PUT, DELETE"