diff --git a/config.sample.yaml b/config.sample.yaml
index 7f9165a..0d17567 100644
--- a/config.sample.yaml
+++ b/config.sample.yaml
@@ -1,6 +1,7 @@
-baseurl: 'https://example.org'
-accesstoken: 't0ps3cr3t'
-userid: '@jd:example.org'
+matrix:
+  baseurl: 'https://example.org'
+  accesstoken: 't0ps3cr3t'
+  userid: '@jd:example.org'
 
 infrastructure: '/home/qwer/scripts'
 ssh:
diff --git a/index.js b/index.js
index edfe258..9422887 100644
--- a/index.js
+++ b/index.js
@@ -5,9 +5,9 @@ const yaml = require('js-yaml');
 
 const config = yaml.safeLoad(fs.readFileSync('config.yaml'));
 const matrixclient = sdk.createClient({
-    baseUrl: config.baseurl,
-    accessToken: config.accesstoken,
-    userId: config.userid
+    baseUrl: config.matrix.baseurl,
+    accessToken: config.matrix.accesstoken,
+    userId: config.matrix.userid
 });
 const ssh = new node_ssh();