diff --git a/Dockerfile b/Dockerfile
index 8500333..f6fb592 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,18 +17,16 @@ LABEL name="pcp" \
       io.openshift.expose-services="44322:pmproxy" \
       io.openshift.tags="pcp,performance,monitoring"
 
-RUN dnf install -y --setopt=tsflags=nodocs procps-ng kmod gettext pcp pcp-zeroconf \
-    pcp-pmda-openmetrics pcp-pmda-netcheck && \
+RUN groupadd -g 1001 -r pcp && \
+    useradd  -u 1001 -g pcp -r -d /var/lib/pcp -s /sbin/nologin -c "Performance Co-Pilot" pcp && \
+    dnf install -y --setopt=tsflags=nodocs procps-ng gettext pcp pcp-zeroconf && \
     dnf clean all
-RUN systemctl enable pmcd pmlogger pmproxy
-
-# install the additional PMDAs on first run of PMCD
-RUN touch /var/lib/pcp/pmdas/{openmetrics,netcheck}/.NeedInstall
+RUN systemctl enable pmcd pmie pmlogger pmproxy
 
 COPY root /
 
 VOLUME ["/var/log/pcp/pmlogger"]
 EXPOSE 44322
 
-ENTRYPOINT ["/usr/libexec/container-setup"]
+ENTRYPOINT ["container-entrypoint"]
 CMD ["/usr/sbin/init"]
diff --git a/root/usr/libexec/container-setup b/root/usr/bin/container-entrypoint
similarity index 100%
rename from root/usr/libexec/container-setup
rename to root/usr/bin/container-entrypoint