diff --git a/users/bashrc.sls b/users/bashrc.sls
index a4fa3f9..e1f2a87 100644
--- a/users/bashrc.sls
+++ b/users/bashrc.sls
@@ -20,7 +20,7 @@ users_{{ name }}_user_bashrc:
     - name: {{ home }}/.bashrc
     - user: {{ name }}
     - group: {{ user_group }}
-    - mode: 644
+    - mode: '0644'
     - template: jinja
     - source:
       - salt://users/files/bashrc/{{ name }}/bashrc
diff --git a/users/googleauth.sls b/users/googleauth.sls
index 22e5065..3e57ad6 100644
--- a/users/googleauth.sls
+++ b/users/googleauth.sls
@@ -13,7 +13,7 @@ users_{{ users.googleauth_dir }}:
     - name: {{ users.googleauth_dir }}
     - user: root
     - group: {{ users.root_group }}
-    - mode: 600
+    - mode: '0600'
 
 {%-   for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %}
 {%-     if 'google_auth' in user %}
diff --git a/users/init.sls b/users/init.sls
index 057e8d5..b62aef1 100644
--- a/users/init.sls
+++ b/users/init.sls
@@ -221,8 +221,8 @@ user_keydir_{{ name }}:
     - user: {{ name }}
     - group: {{ user_group }}
     - makedirs: True
-    - mode: 700
-    - dir_mode: 700
+    - mode: '0700'
+    - dir_mode: '0700'
     - require:
       - user: {{ name }}
       - group: {{ user_group }}
@@ -246,9 +246,9 @@ users_{{ name }}_{{ key_name }}_key:
     - user: {{ name }}
     - group: {{ user_group }}
       {% if key_name.endswith(".pub") %}
-    - mode: 644
+    - mode: '0644'
       {% else %}
-    - mode: 600
+    - mode: '0600'
       {% endif %}
     - show_diff: False
     {%- set key_value = salt['pillar.get']('users:'+name+':ssh_keys:'+_key) %}
@@ -272,7 +272,7 @@ users_authorized_keys_{{ name }}:
     - name: {{ home }}/.ssh/authorized_keys
     - user: {{ name }}
     - group: {{ user_group }}
-    - mode: 600
+    - mode: '0600'
 {% if 'ssh_auth_file' in user %}
     - contents: |
         {% for auth in user.ssh_auth_file -%}
@@ -305,7 +305,7 @@ user_ssh_keys_files_{{ name }}_{{ key_name }}_private_key:
     - name: {{ home }}/.ssh/{{ key_name }}
     - user: {{ name }}
     - group: {{ user_group }}
-    - mode: 600
+    - mode: '0600'
     - show_diff: False
     - contents_pillar: {{ pillar_name }}:{{ key_name }}:privkey
     - require:
@@ -318,7 +318,7 @@ user_ssh_keys_files_{{ name }}_{{ key_name }}_public_key:
     - name: {{ home }}/.ssh/{{ key_name }}.pub
     - user: {{ name }}
     - group: {{ user_group }}
-    - mode: 644
+    - mode: '0644'
     - show_diff: False
     - contents_pillar: {{ pillar_name }}:{{ key_name }}:pubkey
     - require:
@@ -377,7 +377,7 @@ users_ssh_config_{{ name }}:
     - name: {{ home }}/.ssh/config
     - user: {{ name }}
     - group: {{ user_group }}
-    - mode: 640
+    - mode: '0640'
     - contents: |
         # Managed by Saltstack
         # Do Not Edit
@@ -516,7 +516,7 @@ users_googleauth-{{ svc }}-{{ name }}:
     - contents_pillar: 'users:{{ name }}:google_auth:{{ svc }}'
     - user: root
     - group: {{ users.root_group }}
-    - mode: 400
+    - mode: '0400'
     - require:
       - pkg: users_googleauth-package
 {%-     endfor %}
diff --git a/users/profile.sls b/users/profile.sls
index 3c30d8c..9490b52 100644
--- a/users/profile.sls
+++ b/users/profile.sls
@@ -20,7 +20,7 @@ users_{{ name }}_user_profile:
     - name: {{ home }}/.profile
     - user: {{ name }}
     - group: {{ user_group }}
-    - mode: 644
+    - mode: '0644'
     - template: jinja
     - source:
       - salt://users/files/profile/{{ name }}/profile
diff --git a/users/vimrc.sls b/users/vimrc.sls
index abb9274..f1b8076 100644
--- a/users/vimrc.sls
+++ b/users/vimrc.sls
@@ -24,7 +24,7 @@ users_{{ name }}_user_vimrc:
     - name: {{ home }}/.vimrc
     - user: {{ name }}
     - group: {{ user_group }}
-    - mode: 644
+    - mode: '0644'
     - template: jinja
     - source:
       - salt://users/files/vimrc/{{ name }}/vimrc