diff --git a/config.template.yml b/config.template.yml
index 1ea19a2ee..6457bbf8f 100644
--- a/config.template.yml
+++ b/config.template.yml
@@ -22,6 +22,14 @@ logs_level: debug
 # be redirected upon successful authentication.
 default_redirection_url: https://home.example.com:8080/
 
+# TOTP Issuer Name
+#
+# This will be the issuer name displayed in Google Authenticator
+# See: https://github.com/google/google-authenticator/wiki/Key-Uri-Format for more info on issuer names
+totp:
+  issuer: authelia.com
+
+
 # LDAP configuration
 #
 # Example: for user john, the DN will be cn=john,ou=users,dc=example,dc=com
diff --git a/test/features/step_definitions/hooks.ts b/test/features/step_definitions/hooks.ts
index bfbc121de..eb46b8a8f 100644
--- a/test/features/step_definitions/hooks.ts
+++ b/test/features/step_definitions/hooks.ts
@@ -69,9 +69,8 @@ function createSingleFactorConfiguration(): BluebirdPromise<void> {
 
 function createCustomTotpIssuerConfiguration(): BluebirdPromise<void> {
   return exec("\
-  cat config.template.yml > config.test.yml && \
-  echo 'totp:' >> config.test.yml && \
-  echo '  issuer: custom.com' >> config.test.yml \
+  cat config.template.yml | \
+  sed 's/issuer: authelia.com/issuer: custom.com/' > config.test.yml \
   ");
 }