diff --git a/prometheus/archive/install.sls b/prometheus/archive/install.sls
index b5dbb63..6a20e08 100644
--- a/prometheus/archive/install.sls
+++ b/prometheus/archive/install.sls
@@ -98,8 +98,8 @@ prometheus-archive-install-{{ name }}-file-directory:
     - name: {{ p.dir.var }}{{ p.div }}{{ name }}
     - makedirs: True
             {%- if grains.os != 'Windows' %}
-    - user: {{ name|truncate(32) }}
-    - group: {{ name|truncate(32) }}
+    - user: {{ name|truncate(32, False, "") }}
+    - group: {{ name|truncate(16, False, "") }}
     - mode: '0755'
     - require:
       - user: prometheus-config-users-install-{{ name }}-user-present
@@ -123,8 +123,8 @@ prometheus-archive-install-{{ name }}-managed-service:
     - context:
         desc: prometheus - {{ name }} service
         name: {{ name }}
-        user: {{ name|truncate(32) }}
-        group: {{ name|truncate(32) }}
+        user: {{ name|truncate(32, False, "") }}
+        group: {{ name|truncate(16, False, "") }}
         env: {{ p.pkg.component[name]['service'].get('env', [])|tojson }}
         workdir: {{ p.dir.var }}/{{ name }}
         stop: ''
diff --git a/prometheus/config/clean.sls b/prometheus/config/clean.sls
index 4e94d5f..8056ab2 100644
--- a/prometheus/config/clean.sls
+++ b/prometheus/config/clean.sls
@@ -19,12 +19,12 @@ prometheus-config-clean-{{ name }}:
     - name: {{ name }}_environ
              {%- endif %}
   user.absent:
-    - name: {{ name|truncate(32) }}
+    - name: {{ name|truncate(32, False, "") }}
                 {%- if grains.os_family == 'MacOS' %}
     - onlyif: /usr/bin/dscl . list /Users | grep {{ name }} >/dev/null 2>&1
                 {%- endif %}
   group.absent:
-    - name: {{ name|truncate(32) }}
+    - name: {{ name|truncate(16, False, "") }}
     - require:
        - {{ sls_config_clean }}
 
diff --git a/prometheus/config/users.sls b/prometheus/config/users.sls
index cd1b4d5..937f97a 100644
--- a/prometheus/config/users.sls
+++ b/prometheus/config/users.sls
@@ -8,16 +8,16 @@
 
 prometheus-config-users-install-{{ name }}-group-present:
   group.present:
-    - name: {{ name|truncate(32) }}
+    - name: {{ name|truncate(16, False, "") }}
     - system: true
     - require_in:
       - user: prometheus-config-users-install-{{ name }}-user-present
 
 prometheus-config-users-install-{{ name }}-user-present:
   user.present:
-    - name: {{ name|truncate(32) }}
+    - name: {{ name|truncate(32, False, "") }}
     - groups:
-      - {{ name|truncate(32) }}
+      - {{ name|truncate(16, False, "") }}
               {%- if grains.os != 'Windows' %}
     - shell: {{ p.shell }}
                   {%- if grains.kernel|lower == 'linux' %}
diff --git a/prometheus/exporters/node_exporter/textfile_collectors/init.sls b/prometheus/exporters/node_exporter/textfile_collectors/init.sls
index b2519a5..2ad5660 100644
--- a/prometheus/exporters/node_exporter/textfile_collectors/init.sls
+++ b/prometheus/exporters/node_exporter/textfile_collectors/init.sls
@@ -18,8 +18,8 @@ prometheus-exporters-{{ name }}-collector-textfile-dir:
     - name: {{ p.pkg.component[name]['service']['args']['collector.textfile.directory'] }}
         {%- if grains.os != 'Windows' %}
     - mode: 755
-    - user: {{ name|truncate(32) }}
-    - group: {{ name|truncate(32) }}
+    - user: {{ name|truncate(32, False, "") }}
+    - group: {{ name|truncate(16, False, "") }}
         {%- endif %}
     - makedirs: True
     - require:
diff --git a/prometheus/service/args/install.sls b/prometheus/service/args/install.sls
index c0a34e2..c00977d 100644
--- a/prometheus/service/args/install.sls
+++ b/prometheus/service/args/install.sls
@@ -25,8 +25,8 @@ include:
 prometheus-service-args-{{ name }}-data-dir:
   file.directory:
     - name: {{ args['storage.tsdb.path'] }}
-    - user: {{ name|truncate(32) }}
-    - group: {{ name|truncate(32) }}
+    - user: {{ name|truncate(32, False, "") }}
+    - group: {{ name|truncate(16, False, "") }}
     - makedirs: True
     - watch_in:
       - service: prometheus-service-running-{{ name }}
diff --git a/test/integration/default/controls/archive_spec.rb b/test/integration/default/controls/archive_spec.rb
index 5e0a17f..f7fbd55 100644
--- a/test/integration/default/controls/archive_spec.rb
+++ b/test/integration/default/controls/archive_spec.rb
@@ -53,10 +53,10 @@ control 'prometheus components' do
   describe user('mysqld_exporter') do
     it { should exist }
   end
-  describe group('prometheus_bigquery_remote_st...') do
+  describe group('prometheus_bigqu') do
     it { should exist }
   end
-  describe user('prometheus_bigquery_remote_st...') do
+  describe user('prometheus_bigquery_remote_stora') do
     it { should exist }
   end
   describe directory('/var/lib/prometheus') do
@@ -173,7 +173,7 @@ control 'prometheus components' do
   end
   describe directory('/var/lib/prometheus/prometheus_bigquery_remote_storage_adapter') do # rubocop:disable Layout/LineLength
     it { should exist }
-    its('group') { should eq 'prometheus_bigquery_remote_st...' }
+    its('group') { should eq 'prometheus_bigqu' }
   end
   describe file("#{service_dir}/prometheus-bigquery-backend.service") do
     it { should exist }