diff --git a/config.go b/config.go
index 9115325..f7e9d77 100644
--- a/config.go
+++ b/config.go
@@ -24,7 +24,7 @@ func validateConfigEntry(entry string, name string) bool {
 }
 
 func LoadConfig() (*Config, error) {
-	viper.SetConfigName("guildgate.yaml")
+	viper.SetConfigName("guildgate")
 	viper.AddConfigPath("/etc/")
 	viper.AddConfigPath(".")
 	err := viper.ReadInConfig()
diff --git a/guildgate.yaml.sample b/guildgate.yaml.sample
index 09a4ba0..c094c94 100644
--- a/guildgate.yaml.sample
+++ b/guildgate.yaml.sample
@@ -1,5 +1,5 @@
-ldapUrl   = "ldaps://identity.example.com:636"
-adminUser = "cn=guildgate,ou=Software"
-userAttr  = "uid"
-userOu    = "ou=Users"
-ldapDc    = "dc=example,dc=com"
+ldapUrl: "ldaps://identity.example.com:636"
+adminUser: "cn=guildgate,ou=Software"
+userAttr: "uid"
+userOu: "ou=Users"
+ldapDc: "dc=example,dc=com"