diff --git a/templates/bonds.epp b/templates/bonds.epp
index ccaf57c..74a858b 100644
--- a/templates/bonds.epp
+++ b/templates/bonds.epp
@@ -209,10 +209,10 @@
         - <%= $add %>:
             <%- if $option['lifetime'] != undef { -%>
             lifetime: <%= $option['lifetime'] %>
-            <%- } -%> 
+            <%- } -%>
             <%- if $option['label'] != undef { -%>
             label: <%= $option['label'] %>
-            <%- } -%>          
+            <%- } -%>
           <%- } -%>
         <%- } else { -%>
         - <%= $address %>
@@ -234,7 +234,10 @@
     <%- if $nameservers != undef { -%>
       nameservers:
       <%- if $nameservers[search] != undef { -%>
-        search: <%= $nameservers[search] %>
+        search:
+      <%- $nameservers[search].each |$search| { -%>
+          - <%= $search %>
+      <%- } -%>
       <%- } -%>
       <%- if $nameservers[addresses] != undef { -%>
         addresses:
@@ -315,7 +318,10 @@
     <%- } -%>
     <%# Properties for device type bonds -%>
     <%- if $interfaces != undef { -%>
-      interfaces: <%= $interfaces %>
+      interfaces:
+    <%- $interfaces.each |$interface| { -%>
+        - <%= $interface %>
+    <%- } -%>
     <%- } -%>
     <%- if $parameters != undef { -%>
       parameters:
diff --git a/templates/bridges.epp b/templates/bridges.epp
index 1809890..7c8fbb1 100644
--- a/templates/bridges.epp
+++ b/templates/bridges.epp
@@ -196,10 +196,10 @@
         - <%= $add %>:
             <%- if $option['lifetime'] != undef { -%>
             lifetime: <%= $option['lifetime'] %>
-            <%- } -%> 
+            <%- } -%>
             <%- if $option['label'] != undef { -%>
             label: <%= $option['label'] %>
-            <%- } -%>          
+            <%- } -%>
           <%- } -%>
         <%- } else { -%>
         - <%= $address %>
@@ -221,7 +221,10 @@
     <%- if $nameservers != undef { -%>
       nameservers:
       <%- if $nameservers[search] != undef { -%>
-        search: <%= $nameservers[search] %>
+        search:
+      <%- $nameservers[search].each |$search| { -%>
+          - <%= $search %>
+      <%- } -%>
       <%- } -%>
       <%- if $nameservers[addresses] != undef { -%>
         addresses:
@@ -302,7 +305,10 @@
     <%- } -%>
     <%# Properties for device type bridges -%>
     <%- if $interfaces != undef { -%>
-      interfaces: <%= $interfaces %>
+      interfaces:
+    <%- $interfaces.each |$interface| { -%>
+        - <%= $interface %>
+    <%- } -%>
     <%- } -%>
     <%- if $parameters != undef { -%>
       parameters:
diff --git a/templates/dummy_devices.epp b/templates/dummy_devices.epp
index 1f164b5..1826a7b 100644
--- a/templates/dummy_devices.epp
+++ b/templates/dummy_devices.epp
@@ -183,10 +183,10 @@
         - <%= $add %>:
             <%- if $option['lifetime'] != undef { -%>
             lifetime: <%= $option['lifetime'] %>
-            <%- } -%> 
+            <%- } -%>
             <%- if $option['label'] != undef { -%>
             label: <%= $option['label'] %>
-            <%- } -%>          
+            <%- } -%>
           <%- } -%>
         <%- } else { -%>
         - <%= $address %>
@@ -208,7 +208,10 @@
     <%- if $nameservers != undef { -%>
       nameservers:
       <%- if $nameservers[search] != undef { -%>
-        search: <%= $nameservers[search] %>
+        search:
+      <%- $nameservers[search].each |$search| { -%>
+          - <%= $search %>
+      <%- } -%>
       <%- } -%>
       <%- if $nameservers[addresses] != undef { -%>
         addresses:
diff --git a/templates/ethernets.epp b/templates/ethernets.epp
index 9f5a411..9029a35 100644
--- a/templates/ethernets.epp
+++ b/templates/ethernets.epp
@@ -362,7 +362,10 @@
     <%- if $nameservers != undef { -%>
       nameservers:
       <%- if $nameservers[search] != undef { -%>
-        search: <%= $nameservers[search] %>
+        search:
+      <%- $nameservers[search].each |$search| { -%>
+          - <%= $search %>
+      <%- } -%>
       <%- } -%>
       <%- if $nameservers[addresses] != undef { -%>
         addresses:
diff --git a/templates/modems.epp b/templates/modems.epp
index a4b3c2e..6a19263 100644
--- a/templates/modems.epp
+++ b/templates/modems.epp
@@ -178,11 +178,11 @@
     <%- if $openvswitch != undef { -%>
       openvswitch:
         <%- if $openvswitch[external_ids] != undef { -%>
-        external-ids: 
+        external-ids:
 <%= $openvswitch[external_ids] %>
         <%- } -%>
         <%- if $openvswitch[other_config] != undef { -%>
-        other-config: 
+        other-config:
 <%= $openvswitch[other_config] %>
         <%- } -%>
         <%- if $openvswitch[lacp] != undef { -%>
@@ -327,10 +327,10 @@
         - <%= $add %>:
             <%- if $option['lifetime'] != undef { -%>
             lifetime: <%= $option['lifetime'] %>
-            <%- } -%> 
+            <%- } -%>
             <%- if $option['label'] != undef { -%>
             label: <%= $option['label'] %>
-            <%- } -%>          
+            <%- } -%>
           <%- } -%>
         <%- } else { -%>
         - <%= $address %>
@@ -352,7 +352,10 @@
     <%- if $nameservers != undef { -%>
       nameservers:
       <%- if $nameservers[search] != undef { -%>
-        search: <%= $nameservers[search] %>
+        search:
+      <%- $nameservers[search].each |$search| { -%>
+          - <%= $search %>
+      <%- } -%>
       <%- } -%>
       <%- if $nameservers[addresses] != undef { -%>
         addresses:
diff --git a/templates/tunnels.epp b/templates/tunnels.epp
index 46484e1..0c0e032 100644
--- a/templates/tunnels.epp
+++ b/templates/tunnels.epp
@@ -224,10 +224,10 @@
         - <%= $add %>:
             <%- if $option['lifetime'] != undef { -%>
             lifetime: <%= $option['lifetime'] %>
-            <%- } -%> 
+            <%- } -%>
             <%- if $option['label'] != undef { -%>
             label: <%= $option['label'] %>
-            <%- } -%>          
+            <%- } -%>
           <%- } -%>
         <%- } else { -%>
         - <%= $address %>
@@ -249,7 +249,10 @@
     <%- if $nameservers != undef { -%>
       nameservers:
       <%- if $nameservers[search] != undef { -%>
-        search: <%= $nameservers[search] %>
+        search:
+      <%- $nameservers[search].each |$search| { -%>
+          - <%= $search %>
+      <%- } -%>
       <%- } -%>
       <%- if $nameservers[addresses] != undef { -%>
         addresses:
@@ -343,15 +346,15 @@
     <%- } -%>
     <%- if $key.is_a(Hash) { -%>
       key:
-      <%- if $key[input] != undef { -%>  
+      <%- if $key[input] != undef { -%>
         input: <%= $key[input] %>
       <%- } -%>
-      <%- if $key[output] != undef { -%>  
+      <%- if $key[output] != undef { -%>
         output: <%= $key[output] %>
       <%- } -%>
-      <%- if $key['private'] != undef { -%>  
+      <%- if $key['private'] != undef { -%>
         private: <%= $key['private'] %>
-      <%- } -%>  
+      <%- } -%>
     <%- } -%>
     <%- elsif $key.is_a(Scalar) { -%>
       key: <%= $key %>
@@ -367,19 +370,19 @@
         <%- $peers.each |$peer| { -%>
         - keys:
             public: <%= $peer[keys][public] %>
-            <%- if $peer[keys][shared] != undef { -%>  
+            <%- if $peer[keys][shared] != undef { -%>
             shared: <%= $peer[keys][shared] %>
             <%- } -%>
-          <%- if $peer[endpoint] != undef { -%>  
+          <%- if $peer[endpoint] != undef { -%>
           endpoint: <%= $peer[endpoint] %>
           <%- } -%>
-          <%- if $peer[allowed_ips] != undef { -%>  
+          <%- if $peer[allowed_ips] != undef { -%>
           allowed-ips: <%= $peer[allowed_ips] %>
           <%- } -%>
-          <%- if $peer[keepalive] != undef { -%>  
+          <%- if $peer[keepalive] != undef { -%>
           keepalive: <%= $peer[keepalive] %>
           <%- } -%>
-        <%- } -%>  
+        <%- } -%>
     <%- } -%>
     <%- if $id != undef { -%>
       id: <%= $id %>
diff --git a/templates/vlans.epp b/templates/vlans.epp
index c61f50a..db3f4c8 100644
--- a/templates/vlans.epp
+++ b/templates/vlans.epp
@@ -187,10 +187,10 @@
         - <%= $add %>:
             <%- if $option['lifetime'] != undef { -%>
             lifetime: <%= $option['lifetime'] %>
-            <%- } -%> 
+            <%- } -%>
             <%- if $option['label'] != undef { -%>
             label: <%= $option['label'] %>
-            <%- } -%>          
+            <%- } -%>
           <%- } -%>
         <%- } else { -%>
         - <%= $address %>
@@ -212,7 +212,10 @@
     <%- if $nameservers != undef { -%>
       nameservers:
       <%- if $nameservers[search] != undef { -%>
-        search: <%= $nameservers[search] %>
+        search:
+      <%- $nameservers[search].each |$search| { -%>
+          - <%= $search %>
+      <%- } -%>
       <%- } -%>
       <%- if $nameservers[addresses] != undef { -%>
         addresses:
diff --git a/templates/wifis.epp b/templates/wifis.epp
index 133ea5c..e9d0244 100644
--- a/templates/wifis.epp
+++ b/templates/wifis.epp
@@ -190,11 +190,11 @@
     <%- if $openvswitch != undef { -%>
       openvswitch:
         <%- if $openvswitch[external_ids] != undef { -%>
-        external-ids: 
+        external-ids:
 <%= $openvswitch[external_ids] %>
         <%- } -%>
         <%- if $openvswitch[other_config] != undef { -%>
-        other-config: 
+        other-config:
 <%= $openvswitch[other_config] %>
         <%- } -%>
         <%- if $openvswitch[lacp] != undef { -%>
@@ -339,10 +339,10 @@
         - <%= $add %>:
             <%- if $option['lifetime'] != undef { -%>
             lifetime: <%= $option['lifetime'] %>
-            <%- } -%> 
+            <%- } -%>
             <%- if $option['label'] != undef { -%>
             label: <%= $option['label'] %>
-            <%- } -%>          
+            <%- } -%>
           <%- } -%>
         <%- } else { -%>
         - <%= $address %>
@@ -364,7 +364,10 @@
     <%- if $nameservers != undef { -%>
       nameservers:
       <%- if $nameservers[search] != undef { -%>
-        search: <%= $nameservers[search] %>
+        search:
+      <%- $nameservers[search].each |$search| { -%>
+          - <%= $search %>
+      <%- } -%>
       <%- } -%>
       <%- if $nameservers[addresses] != undef { -%>
         addresses: