diff --git a/Dockerfile.openshift b/Dockerfile.openshift
index f68bb0a77..393181a78 100644
--- a/Dockerfile.openshift
+++ b/Dockerfile.openshift
@@ -5,6 +5,4 @@ RUN make build
 
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
 COPY --from=builder /go/src/github.com/kubernetes-csi/node-driver-registrar/bin/csi-node-driver-registrar /usr/bin/
-RUN useradd csi-node-driver-registrar
-USER csi-node-driver-registrar
 ENTRYPOINT ["/usr/bin/csi-node-driver-registrar"]
diff --git a/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7
index 80c05dd12..142182c04 100644
--- a/Dockerfile.openshift.rhel7
+++ b/Dockerfile.openshift.rhel7
@@ -5,6 +5,4 @@ RUN make build
 
 FROM registry.svc.ci.openshift.org/ocp/4.0:base
 COPY --from=builder /go/src/github.com/kubernetes-csi/node-driver-registrar/bin/csi-node-driver-registrar /usr/bin/
-RUN useradd csi-node-driver-registrar
-USER csi-node-driver-registrar
 ENTRYPOINT ["/usr/bin/csi-node-driver-registrar"]