diff --git a/metacpan_server.conf b/metacpan_server.conf
deleted file mode 100644
index 0511a720d..000000000
--- a/metacpan_server.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-git /usr/bin/git
-
-level info
-elasticsearch_servers = http://localhost:9200
-minion_dsn = postgresql:///minion_queue
-port 5000
-
-
- class Log::Log4perl::Appender::File
- filename ../var/log/metacpan.log
- syswrite 1
-
-
-
- # required for server startup -- override this in metacpan_server_local.conf
- private_key 59125ffc09413eed3f2a2c07a37c7a44b95633e2
-
-
-
- host smtp.fastmail.com
- port 465
- username foo@metacpan.org
- password seekrit
-
-
-
-
- key = seekrit
- secret = seekrit
-
-
- key = seekrit
- secret = seekrit
-
-
- key = seekrit
- secret = seekrit
-
-
-
-front_end_url = http://0.0.0.0:5001
diff --git a/metacpan_server.yaml b/metacpan_server.yaml
new file mode 100644
index 000000000..c5834083d
--- /dev/null
+++ b/metacpan_server.yaml
@@ -0,0 +1,34 @@
+git: /usr/bin/git
+
+level: info
+elasticsearch_servers: http://localhost:9200
+minion_dsn: postgresql:///minion_queue
+port: 5000
+
+logger:
+ class: Log::Log4perl::Appender::File
+ filename: ../var/log/metacpan.log
+ syswrite: 1
+
+controller:
+ User::Turing:
+ private_key: 59125ffc09413eed3f2a2c07a37c7a44b95633e2
+
+smtp:
+ host: smtp.fastmail.com
+ port: 465
+ username: foo@metacpan.org
+ password: seekrit
+
+oauth:
+ github:
+ key: seekrit
+ secret: seekrit
+ google:
+ key: seekrit
+ secret: seekrit
+ twitter:
+ key: seekrit
+ secret: seekrit
+
+front_end_url: http://0.0.0.0:5001
diff --git a/metacpan_server_testing.conf b/metacpan_server_testing.conf
deleted file mode 100644
index 3982d3acb..000000000
--- a/metacpan_server_testing.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-cpan var/t/tmp/fakecpan
-die_on_error 1
-level warn
-port 5000
-source_base var/t/tmp/source
-
-elasticsearch_servers = http://elasticsearch_test:9200
-
-
- class Log::Log4perl::Appender::Screen
- name testing
-
-
-
- servers __ENV(ES)__
-
-
-
- servers __ENV(ES)__
-
-
-
- servers __ENV(ES)__
-
-
-
- captcha_class Captcha::Mock
- private_key testing
-
-
-github_key = foo
-github_secret = bar
-
-secret weak
-
-
- host smtp.fastmail.com
- port 465
- username foo@metacpan.org
- password seekrit
-
diff --git a/metacpan_server_testing.yaml b/metacpan_server_testing.yaml
new file mode 100644
index 000000000..3616d5509
--- /dev/null
+++ b/metacpan_server_testing.yaml
@@ -0,0 +1,37 @@
+cpan: var/t/tmp/fakecpan
+die_on_error: 1
+level: warn
+port: 5000
+source_base: var/t/tmp/source
+
+elasticsearch_servers: http://elasticsearch_test:9200
+
+logger:
+ class: Log::Log4perl::Appender::Screen
+ name: testing
+
+model:
+ CPAN:
+ servers: __ENV(ES)__
+ User:
+ servers: __ENV(ES)__
+
+plugin:
+ Session:
+ servers: __ENV(ES)__
+
+controller:
+ User::Turing:
+ captcha_class: Captcha::Mock
+ private_key: testing
+
+github_key: foo
+github_secret: bar
+
+secret: weak
+
+smtp:
+ host: smtp.fastmail.com
+ port: 465
+ username: foo@metacpan.org
+ password: seekrit