diff --git a/pillar/common.sls b/pillar/common.sls
index 08f3e97..ad1a298 100644
--- a/pillar/common.sls
+++ b/pillar/common.sls
@@ -2,10 +2,10 @@
 
 locale:
   present:
-    - 'en_US.UTF-8 UTF-8'
+    - en_US.UTF-8 UTF-8
   default:
-    name: 'en_US.UTF-8'
-    requires: 'en_US.UTF-8 UTF-8'
+    name: en_US.UTF-8
+    requires: en_US.UTF-8 UTF-8
 ntp:
   ng:
     settings:
@@ -30,9 +30,6 @@ ntp:
           - ::1
         trustedkey:
           - 1
-timezone:
-  name: 'UTC'
-  utc: True
 salt:
   gitfs:
     libgit2:
@@ -88,18 +85,18 @@ sshd_config:
     - /etc/ssh/ssh_host_rsa_key
     - /etc/ssh/ssh_host_dsa_key
     - /etc/ssh/ssh_host_ecdsa_key
-{% if osrelease != '11.3' %}
+    {% if osrelease != '11.3' %}
     - /etc/ssh/ssh_host_ed25519_key
-{% endif %}
+    {% endif %}
   PermitRootLogin: without-password
   PrintMotd: yes
-{% if osrelease.startswith('11') and (salt['grains.get']('cpuarch') == 'x86_64') %}
+  {% if osrelease.startswith('11') and (salt['grains.get']('cpuarch') == 'x86_64') %}
   # TODO: support more 64bit archs https://progress.opensuse.org/issues/15794
   Subsystem: sftp /usr/lib64/ssh/sftp-server
-{% else %}
+  {% else %}
   # TODO: upstream fix is not sufficient https://github.com/saltstack-formulas/openssh-formula/pull/57
   Subsystem: sftp /usr/lib/ssh/sftp-server
-{% endif %}
+  {% endif %}
   UseDNS: yes
   matches:
     root:
@@ -107,3 +104,6 @@ sshd_config:
         User: root
       options:
         Banner: /etc/ssh/banner
+timezone:
+  name: UTC
+  utc: True
diff --git a/pillar/top.sls b/pillar/top.sls
index 53493e7..2b7f079 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -10,30 +10,30 @@
 production:
   '*':
     - common
-{% for role in roles %}
+  {% for role in roles %}
   'roles:{{ role }}':
     - match: grain
     - role.{{ role }}
-{% endfor %}
-{% if virt_cluster %}
+  {% endfor %}
+  {% if virt_cluster %}
   'virt_cluster:{{ virt_cluster }}':
     - match: grain
     - virt_cluster.{{ virt_cluster }}
   'G@virt_cluster:{{ virt_cluster }} and G@virtual:{{ virtual }}':
     - match: compound
     - virt_cluster.{{ virt_cluster }}.{{ virtual }}
-{% endif %}
+  {% endif %}
   'virtual:{{ virtual }}':
     - match: grain
     - virtual.{{ virtual }}
   'country:{{ country }}':
     - match: grain
     - country.{{ country }}
-{% if domain %}
+  {% if domain %}
   'domain:{{ domain }}':
     - match: grain
     - domain.{{ domain.replace('.', '_') }}
-{% endif %}
+  {% endif %}
   'osrelease:{{ osrelease }}':
     - match: grain
     - osrelease.{{ osrelease.replace('.', '_') }}
diff --git a/salt/profile/zypper/repositories.sls b/salt/profile/zypper/repositories.sls
index d68ca59..2c1d694 100644
--- a/salt/profile/zypper/repositories.sls
+++ b/salt/profile/zypper/repositories.sls
@@ -4,16 +4,16 @@
 {{ repo }}:
   pkgrepo.managed:
     - baseurl: {{ data.baseurl }}
-{% if data.has_key('priority') %}
+    {% if data.has_key('priority') %}
     - priority: {{ data.priority }}
-{% endif %}
-{% if data.has_key('refresh') %}
+    {% endif %}
+    {% if data.has_key('refresh') %}
     - refresh: {{ data.refresh }}
-{% endif %}
-{% if data.has_key('gpgcheck') %}
+    {% endif %}
+    {% if data.has_key('gpgcheck') %}
     - gpgcheck: {{ data.gpgcheck }}
-{% endif %}
-{% if data.has_key('key_url') %}
+    {% endif %}
+    {% if data.has_key('key_url') %}
     - key_url: {{ data.key_url }}
-{% endif %}
+    {% endif %}
 {% endfor %}
diff --git a/salt/top.sls b/salt/top.sls
index 10c2777..d40f1ba 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -3,8 +3,8 @@
 production:
   '*':
     - role.base
-{% for role in roles %}
+  {% for role in roles %}
   'roles:{{ role }}':
     - match: grain
     - role.{{ role }}
-{% endfor %}
+  {% endfor %}