diff --git a/Makefile b/Makefile
index c8f98404a75..b779ffaf0de 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ lint_erb: ## Lints ERB files
 	bundle exec erblint app/views app/components
 
 lint_yaml: normalize_yaml ## Lints YAML files
-	(! git diff --name-only | grep "^config/.*\.yml$$") || (echo "Error: Run 'make normalize_yaml' to normalize YAML"; exit 1)
+	(! git diff --name-only | grep "^config/.*\.yml") || (echo "Error: Run 'make normalize_yaml' to normalize YAML"; exit 1)
 
 lint_font_glyphs: ## Lints to validate content glyphs match expectations from fonts
 	scripts/yaml_characters \
diff --git a/config/application.yml.default b/config/application.yml.default
index d21d14aaade..47f54bdcde8 100644
--- a/config/application.yml.default
+++ b/config/application.yml.default
@@ -64,20 +64,20 @@ country_phone_number_overrides: '{}'
 database_host: ''
 database_name: ''
 database_password: ''
+database_pool_idp: 5
 database_read_replica_host: ''
 database_readonly_password: ''
 database_readonly_username: ''
-database_username: ''
-database_worker_jobs_host: ''
-database_worker_jobs_name: ''
-database_worker_jobs_password: ''
-database_worker_jobs_username: ''
-database_pool_idp: 5
 database_socket: ''
 database_sslmode: 'verify-full'
 database_statement_timeout: 2_500
 database_timeout: 5_000
+database_username: ''
+database_worker_jobs_host: ''
+database_worker_jobs_name: ''
+database_worker_jobs_password: ''
 database_worker_jobs_sslmode: 'verify-full'
+database_worker_jobs_username: ''
 deleted_user_accounts_report_configs: '[]'
 deliver_mail_async: false
 development_mailer_deliver_method: letter_opener