diff --git a/values-local.yaml.example b/values-local.yaml.example
index 0e3e7ea21de288fcd81380ba65c706a4311eb243..b8669dd293cac8175be684cd6eb42a5e7629bb6d 100644
--- a/values-local.yaml.example
+++ b/values-local.yaml.example
@@ -121,7 +121,7 @@ smtp_settings:
   # Enable using these SMTP settings
   enabled: false
   # Username for SMTP authentication
-  smtp_user: admin@example.com 
+  smtp_user: admin@example.com
   # Password for STMP authentication
   smtp_pass: password
   # Hostname of the mailserver
@@ -129,7 +129,7 @@ smtp_settings:
   # SMTP from email address
   smtp_from: admin@example.com
   # SMTP from name
-  smtp_name: Admin
+  smtp_name: WordPress Admin
   # SMTP port number - likely to be 25, 465 or 587
   smtp_port: 587
   # Encryption system to use - ssl or tls
diff --git a/values.yaml b/values.yaml
index 0a42e6b3e7412f5913a27fa209c68b9380aee704..317dc07c02a54150dc944c30218c140f1310ae13 100644
--- a/values.yaml
+++ b/values.yaml
@@ -192,11 +192,11 @@ service:
 # See values-local.yaml.example for an explanation of these variables
 smtp_settings:
   enabled: false
-  smtp_user: admin@example.com 
+  smtp_user: admin@example.com
   smtp_pass: password
   smtp_host: smtp.greenhost.nl
   smtp_from: admin@example.com
-  smtp_name: Admin
+  smtp_name: WordPress Admin
   smtp_port: 587
   smtp_secure: 'tls'
   smtp_auth: true
diff --git a/wp-cli-docker/roles/wordpress-init/tasks/smtp.yml b/wp-cli-docker/roles/wordpress-init/tasks/smtp.yml
index 5f26699dd9cd198f6ff00200b974b75d1ac8a146..ac983fca9add0f174a32f6365dc1a7a691b478ae 100644
--- a/wp-cli-docker/roles/wordpress-init/tasks/smtp.yml
+++ b/wp-cli-docker/roles/wordpress-init/tasks/smtp.yml
@@ -1,8 +1,8 @@
 - name: Define SMTP variables
-  shell: wp {{ cli_args }} config set "{{ item.key }}" "{{ item.value }}" --add --type=constant
+  command: wp {{ cli_args }} config set "{{ item.key }}" "{{ item.value }}" --add --type=constant
   loop: "{{ WP_SMTP_SETTINGS | dict2items }}"
 
 - name: Define SMTP variables
-  shell: wp {{ cli_args }} config set "{{ item.key }}" "{{ item.value }}" --add --raw --type=constant
+  command: wp {{ cli_args }} config set "{{ item.key }}" "{{ item.value }}" --add --raw --type=constant
   loop: "{{ WP_SMTP_RAW_SETTINGS | dict2items }}"