diff --git a/config-demo.toml b/config-demo.toml
index 7aff549..f61a22a 100644
--- a/config-demo.toml
+++ b/config-demo.toml
@@ -1,15 +1,15 @@
 [app]
-    # Interface and port where the app will run its webserver.
-    address = "0.0.0.0:9000"
+# Interface and port where the app will run its webserver.
+address = "0.0.0.0:9000"
 
 # Database.
 [db]
-    host = "demo-db"
-    port = 5432
-    user = "listmonk"
-    password = "listmonk"
-    database = "listmonk"
-    ssl_mode = "disable"
-    max_open = 25
-    max_idle = 25
-    max_lifetime = "300s"
+host = "demo-db"
+port = 5432
+user = "listmonk"
+password = "listmonk"
+database = "listmonk"
+ssl_mode = "disable"
+max_open = 25
+max_idle = 25
+max_lifetime = "300s"
diff --git a/config.toml.sample b/config.toml.sample
index 7b09b77..4b178e2 100644
--- a/config.toml.sample
+++ b/config.toml.sample
@@ -1,22 +1,25 @@
 [app]
-    # Interface and port where the app will run its webserver.
-    address = "0.0.0.0:9000"
+# Interface and port where the app will run its webserver.  The default value
+# of localhost will only listen to connections from the current machine. To
+# listen on all interfaces use '0.0.0.0'. To listen on the default web address
+# port, use port 80 (this will require running with elevated permissions).
+address = "localhost:9000"
 
-    # BasicAuth authentication for the admin dashboard. This will eventually
-    # be replaced with a better multi-user, role-based authentication system.
-    # IMPORTANT: Leave both values empty to disable authentication on admin
-    # only where an external authentication is already setup.
-    admin_username = "listmonk"
-    admin_password = "listmonk"
+# BasicAuth authentication for the admin dashboard. This will eventually
+# be replaced with a better multi-user, role-based authentication system.
+# IMPORTANT: Leave both values empty to disable authentication on admin
+# only where an external authentication is already setup.
+admin_username = "listmonk"
+admin_password = "listmonk"
 
 # Database.
 [db]
-    host = "db"
-    port = 5432
-    user = "listmonk"
-    password = "listmonk"
-    database = "listmonk"
-    ssl_mode = "disable"
-    max_open = 25
-    max_idle = 25
-    max_lifetime = "300s"
+host = "localhost"
+port = 5432
+user = "listmonk"
+password = "listmonk"
+database = "listmonk"
+ssl_mode = "disable"
+max_open = 25
+max_idle = 25
+max_lifetime = "300s"