diff --git a/templates/default/apache.yaml.erb b/templates/default/apache.yaml.erb
index cf94ee3b..851432df 100644
--- a/templates/default/apache.yaml.erb
+++ b/templates/default/apache.yaml.erb
@@ -1,8 +1,8 @@
 instances:
 <% @instances.each do |i| -%>
   - apache_status_url: <%= i['status_url'] %>
-    tags:
   <% if i.key?('tags') -%>
+    tags:
     <% i['tags'].each do |t| -%>
     - <%= t %>
     <% end -%>
diff --git a/templates/default/mysql.yaml.erb b/templates/default/mysql.yaml.erb
index a752997a..555a4a4a 100644
--- a/templates/default/mysql.yaml.erb
+++ b/templates/default/mysql.yaml.erb
@@ -3,8 +3,8 @@ instances:
   - server: <%= i['server'] %>
     user: <%= i['user'] %>
     pass: <%= i['pass'] %>
-    tags:
   <% if i.key?('tags') -%>
+    tags:
     <% i['tags'].each do |t| -%>
     - <%= t %>
     <% end -%>
diff --git a/templates/default/nginx.yaml.erb b/templates/default/nginx.yaml.erb
index f78ab5a1..fc1a6d2b 100644
--- a/templates/default/nginx.yaml.erb
+++ b/templates/default/nginx.yaml.erb
@@ -1,8 +1,8 @@
 instances:
 <% @instances.each do |i| -%>
   - nginx_status_url: <%= i['nginx_status_url'] %>
-    tags:
   <% if i.key?('tags') -%>
+    tags:
     <% i['tags'].each do |t| -%>
     - <%= t %>
     <% end -%>
diff --git a/templates/default/postgres.yaml.erb b/templates/default/postgres.yaml.erb
index 922cb604..7657f7af 100644
--- a/templates/default/postgres.yaml.erb
+++ b/templates/default/postgres.yaml.erb
@@ -7,8 +7,10 @@ instances:
     port: <%= i["port"] || 5432 %>
     username: <%= i["username"] %>
     password: <%= i["password"] %>
+    <% if i.key?("tags") -%>
     tags:
-    <% i["tags"].each do |t| -%>
+        <% i["tags"].each do |t| -%>
       - <%= t %>
-    <% end if i.key?("tags") -%>
+      	<% end -%>
+    <% end -%>
 <% end -%>