diff --git a/misc/packaging/common/config-agent.yml b/misc/packaging/common/config-agent.yml
index 2572a6c..8dae5ad 100644
--- a/misc/packaging/common/config-agent.yml
+++ b/misc/packaging/common/config-agent.yml
@@ -1,3 +1,6 @@
+logger:
+  level: 1
+  format: human
 agent:
   serverUrl: http://127.0.0.1:3000
   privateKeyPath: /var/lib/emissary/agent-key.json
diff --git a/misc/packaging/common/config-server.yml b/misc/packaging/common/config-server.yml
index fabcded..2d12579 100644
--- a/misc/packaging/common/config-server.yml
+++ b/misc/packaging/common/config-server.yml
@@ -1,24 +1,27 @@
-http:
-  host: 0.0.0.0
-  port: 3000
 logger:
   level: 1
   format: human
-database:
-  driver: sqlite
-  dsn: sqlite:///var/lib/emissary/data.sqlite
-cors:
-  allowedOrigins: []
-  allowCredentials: true
-  allowMethods:
-    - POST
-    - GET
-    - PUT
-    - DELETE
-  allowedHeaders:
-    - Origin
-    - Accept
-    - Content-Type
-    - Authorization
-    - Sentry-Trace
+server:
+  privateKeyPath: /var/lib/emissary/server-key.json
+  issuer: http://127.0.0.1:3000
+  http:
+    host: 0.0.0.0
+    port: 3000
+  database:
+    driver: sqlite
+    dsn: sqlite:///var/lib/emissary/data.sqlite
+  cors:
+    allowedOrigins: []
+    allowCredentials: true
+    allowMethods:
+      - POST
+      - GET
+      - PUT
+      - DELETE
+    allowedHeaders:
+      - Origin
+      - Accept
+      - Content-Type
+      - Authorization
+      - Sentry-Trace
   debug: false