diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@
 
 services/identity/target
 services/tunnelbroker/rust-lib/target
+services/tunnelbroker/tunnelbroker.ini
 
 .eslintcache
 .vscode
diff --git a/docs/dev_services.md b/docs/dev_services.md
--- a/docs/dev_services.md
+++ b/docs/dev_services.md
@@ -48,6 +48,9 @@
 [tunnelbroker]
 instance-id = tunnelbroker1
 
+[keyserver]
+default_keyserver_id = ks:256
+
 [amqp]
 uri = amqp://guest:guest@0.0.0.0/vhost
 ```
diff --git a/services/tunnelbroker/tunnelbroker.ini b/services/tunnelbroker/tunnelbroker.ini
deleted file mode 100644
--- a/services/tunnelbroker/tunnelbroker.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[tunnelbroker]
-instance-id = tunnelbroker1
-[keyserver]
-default_keyserver_id = ks:256
-[amqp]
-uri = amqp://guest:guest@0.0.0.0/vhost