diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2
index f350815742..d048f6ee5f 100644
--- a/docker/collectd/Dockerfile.j2
+++ b/docker/collectd/Dockerfile.j2
@@ -39,7 +39,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
       'collectd-openldap',
       'collectd-ovs-events',
       'collectd-ovs-stats',
-      'collectd-pcie-errors',
       'collectd-ping',
       'collectd-procevent',
       'collectd-python',
@@ -80,6 +79,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
       ] %}
   {% endif %}
 
+  {% if base_arch != 's390x' %}
+      {% set collectd_packages = collectd_packages + [
+        'collectd-pcie-errors'
+      ] %}
+  {% endif %}
+
 {% endif %}
 
 {{ macros.install_packages(collectd_packages | customizable("packages")) }}