diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 4285a1a..46c3ffb 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -2,13 +2,15 @@
 
 certmgr_mode: webserver
 
+confluence_domain: confluence.regensburg.freifunk.net
+confluence_dbname: confluence
+confluence_dbuser: confluence
+confluence_dbpass: "{{ vault_confluence_dbpass }}"
+
 ntp_servers:
 - 0.de.pool.ntp.org
 - 1.de.pool.ntp.org
 - 2.de.pool.ntp.org
 - 3.de.pool.ntp.org
 
-confluence_domain: confluence.regensburg.freifunk.net
-confluence_dbname: confluence
-confluence_dbuser: confluence
-confluence_dbpass: "{{ vault_confluence_dbpass }}"
+site_domain: regensburg.freifunk.net
diff --git a/roles/dhcpd/defaults/main.yml b/roles/dhcpd/defaults/main.yml
index 1e577dd..5b4d92f 100644
--- a/roles/dhcpd/defaults/main.yml
+++ b/roles/dhcpd/defaults/main.yml
@@ -1,6 +1,5 @@
 ---
 
-dhcp_interface: br-{{ site_code }}
 dhcp_first: "{{ batman_ipv4 | ipaddr('512') | ipaddr('address') }}"
 dhcp_last: "{{ batman_ipv4 | ipaddr('2558') | ipaddr('address') }}"
 name_server: "{{ batman_ipv4 | ipaddr('address') }}"
diff --git a/roles/dhcpd/templates/dhcpd.conf.j2 b/roles/dhcpd/templates/dhcpd.conf.j2
index d8b4ca2..8adeaab 100644
--- a/roles/dhcpd/templates/dhcpd.conf.j2
+++ b/roles/dhcpd/templates/dhcpd.conf.j2
@@ -1,9 +1,11 @@
-# dhcpd.conf
+# {{ ansible_managed }}
 
 # option definitions common to all supported networks...
 option domain-name "{{ site_domain }}";
 option domain-name-servers {{ name_server }};
 
+local-address {{ batman_ipv4 | ipaddr('address') }};
+
 default-lease-time 3600;
 max-lease-time 14400;