diff --git a/bundles/left4dead2/files/server.cfg b/bundles/left4dead2/files/server.cfg
new file mode 100644
index 0000000..3d8a5b2
--- /dev/null
+++ b/bundles/left4dead2/files/server.cfg
@@ -0,0 +1,9 @@
+// defaults
+hostname ${server_name}
+motd_enabled 0
+rcon_password ${rcon_password}
+
+// server specific
+% for line in config:
+${line}
+% endfor
\ No newline at end of file
diff --git a/bundles/left4dead2/items.py b/bundles/left4dead2/items.py
index 5fb9f7d..620baf6 100644
--- a/bundles/left4dead2/items.py
+++ b/bundles/left4dead2/items.py
@@ -44,12 +44,15 @@ svc_systemd = {
 
 for server_name, config in node.metadata.get('left4dead2').items():
     files[f'/opt/l4d2/configs/{server_name}.cfg'] = {
-        'content': '\n'.join(config.get('config', [])) + '\n',
+        'source': 'server.cfg',
+        'content_type': 'mako',
+        'context': {
+            'server_name': server_name,
+            'rcon_password': repo.vault.decrypt('encrypt$gAAAAABpAdZhxwJ47I1AXotuZmBvyZP1ecVTt9IXFkLI28JiVS74LKs9QdgIBz-FC-iXtIHHh_GVGxxKQZprn4UrXZcvZ57kCKxfHBs3cE2JiGnbWE8_mfs=').value,
+            'config': config.get('config', []),
+        },
         'owner': 'steam',
         'mode': '644',
-        'needed_by': {
-            f'svc_systemd:left4dead2-{server_name}.service',
-        },
         'triggers': {
             f'svc_systemd:left4dead2-{server_name}.service:restart',
         },
diff --git a/nodes/ovh.secondary.py b/nodes/ovh.secondary.py
index ed7a3f3..8e86f21 100644
--- a/nodes/ovh.secondary.py
+++ b/nodes/ovh.secondary.py
@@ -43,9 +43,6 @@
                 'config': [
                     'exec server_original.cfg',
                     'sm_forcematch zonemod',
-                    'hostname server3_comp1_test',
-                    'motd_enabled 0',
-                    'rcon_password ' + vault.decrypt('encrypt$gAAAAABpAdZhxwJ47I1AXotuZmBvyZP1ecVTt9IXFkLI28JiVS74LKs9QdgIBz-FC-iXtIHHh_GVGxxKQZprn4UrXZcvZ57kCKxfHBs3cE2JiGnbWE8_mfs=').value,
                 ],
             },
         },