diff --git a/defaults/main/dhcpd_vars.yml b/defaults/main/dhcpd_vars.yml
index 8215888..440f39c 100644
--- a/defaults/main/dhcpd_vars.yml
+++ b/defaults/main/dhcpd_vars.yml
@@ -15,7 +15,7 @@ dhcp_max_lease     : 604800
 dhcp_pxeboot_file  : pxelinux.0
 
 
-dhcp_deploy_to: vlan1
+dhcp_vlan: "{{ deploy_to | default('vlan1') }}"
 
 
 dhcp_networks:
diff --git a/templates/dhcpd_conf.j2 b/templates/dhcpd_conf.j2
index 76d01ca..b588a33 100644
--- a/templates/dhcpd_conf.j2
+++ b/templates/dhcpd_conf.j2
@@ -19,16 +19,17 @@ max-lease-time {{ dhcp_max_lease }};
 authoritative;
 {% endif %}
 
-subnet {{ dhcp_networks[dhcp_deploy_to].subnet }} netmask {{ dhcp_networks[dhcp_deploy_to].netmask }}
+subnet {{ dhcp_networks[dhcp_vlan].subnet }} netmask {{ dhcp_networks[dhcp_vlan].netmask }}
 {
-  range {{ dhcp_networks[dhcp_deploy_to].range_from }} {{ dhcp_networks[dhcp_deploy_to].range_to }};
-  option routers {{ dhcp_networks[dhcp_deploy_to].router }};
-  option broadcast-address {{ dhcp_networks[dhcp_deploy_to].broadcast }};
+  range {{ dhcp_networks[dhcp_vlan].range_from }} {{ dhcp_networks[dhcp_vlan].range_to }};
+  option routers {{ dhcp_networks[dhcp_vlan].router }};
+  option broadcast-address {{ dhcp_networks[dhcp_vlan].broadcast }};
   option domain-name "{{ dhcp_domain_name }}";
-  option domain-name-servers {{ dhcp_networks[dhcp_deploy_to].dns }};
+  option domain-name-servers {{ dhcp_networks[dhcp_vlan].dns }};
 
   filename "{{ dhcp_pxeboot_file }}";
-  next-server {{ dhcp_networks[dhcp_deploy_to].pxeboot }};
+  next-server {{ dhcp_networks[dhcp_vlan].pxeboot }};
+
 
 ### STATIC ASSIGNMENTS ###
 {% for host in static_assignments %}
diff --git a/tests/test.yml b/tests/test.yml
index ad2a221..bf84ec2 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -1,5 +1,13 @@
 ---
 - hosts: localhost
   remote_user: root
+
+  vars:
+    static_assignments:
+      dummy-host:
+        mac_address: "AA:AA:AA:AA:AA:AA"
+        ip_address : "127.0.0.1"
+
+
   roles:
-    - zen_dhcpd
\ No newline at end of file
+    - zen_dhcpd