diff --git a/packaging/images/microshift/Dockerfile b/packaging/images/microshift/Dockerfile
index 4b4d153c39..a450ade96f 100644
--- a/packaging/images/microshift/Dockerfile
+++ b/packaging/images/microshift/Dockerfile
@@ -29,7 +29,12 @@ RUN microdnf install -y \
     && microdnf clean all
 COPY --from=builder /opt/app-root/src/github.com/redhat-et/microshift/_output/bin/linux_$ARCH/microshift /usr/bin/microshift
 
-ENTRYPOINT ["/usr/bin/microshift"]
+RUN mkdir -p /root/crio.conf.d
+
+COPY packaging/crio.conf.d/microshift.conf /root/crio.conf.d/microshift.conf
+COPY packaging/images/microshift/entrypoint.sh /root/entrypoint.sh
+
+ENTRYPOINT ["/root/entrypoint.sh"]
 CMD ["run"]
 
 # To start:
diff --git a/packaging/images/microshift/entrypoint.sh b/packaging/images/microshift/entrypoint.sh
new file mode 100755
index 0000000000..dcd935e038
--- /dev/null
+++ b/packaging/images/microshift/entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+mkdir -p /etc/crio/crio.conf.d
+cp /root/crio.conf.d/microshift.conf /etc/crio/crio.conf.d/microshift.conf
+
+# switch to microshift process
+exec /usr/bin/microshift run
diff --git a/packaging/systemd/microshift-containerized.service b/packaging/systemd/microshift-containerized.service
index d74af64f5c..b6e82a29d8 100644
--- a/packaging/systemd/microshift-containerized.service
+++ b/packaging/systemd/microshift-containerized.service
@@ -15,7 +15,7 @@ Restart=on-failure
 TimeoutStopSec=70
 ExecStartPre=/usr/bin/mkdir -p /var/lib/kubelet ; /usr/bin/mkdir -p /var/hpvolumes
 ExecStartPre=/bin/rm -f %t/%n.ctr-id
-ExecStart=/usr/bin/podman run --cidfile=%t/%n.ctr-id --cgroups=no-conmon --rm --replace --sdnotify=container --label io.containers.autoupdate=registry --network=host --privileged -d --name microshift -v /var/hpvolumes:/var/hpvolumes:z,rw,rshared -v /var/run/crio/crio.sock:/var/run/crio/crio.sock:rw,rshared -v microshift-data:/var/lib/microshift:rw,rshared -v /var/lib/kubelet:/var/lib/kubelet:z,rw,rshared -v /var/log:/var/log quay.io/microshift/microshift:latest
+ExecStart=/usr/bin/podman run --cidfile=%t/%n.ctr-id --cgroups=no-conmon --rm --replace --sdnotify=container --label io.containers.autoupdate=registry --network=host --privileged -d --name microshift -v /var/hpvolumes:/var/hpvolumes:z,rw,rshared -v /var/run/crio/crio.sock:/var/run/crio/crio.sock:rw,rshared -v microshift-data:/var/lib/microshift:rw,rshared -v /var/lib/kubelet:/var/lib/kubelet:z,rw,rshared -v /var/log:/var/log -v /etc:/etc quay.io/microshift/microshift:latest
 ExecStop=/usr/bin/podman stop --ignore --cidfile=%t/%n.ctr-id
 ExecStopPost=/usr/bin/podman rm -f --ignore --cidfile=%t/%n.ctr-id
 Type=notify