diff --git a/Dockerfile.openshift b/Dockerfile.openshift
index 0e48f3666..bd1d6a608 100644
--- a/Dockerfile.openshift
+++ b/Dockerfile.openshift
@@ -1,10 +1,10 @@
 FROM registry.svc.ci.openshift.org/openshift/release:golang-1.11 AS builder
 WORKDIR /go/src/github.com/kubernetes-csi/external-snapshotter
 COPY . .
-RUN go build ./cmd/csi-snapshotter
+RUN make build
 
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
-COPY --from=builder /go/src/github.com/kubernetes-csi/external-snapshotter/csi-snapshotter /usr/bin/
+COPY --from=builder /go/src/github.com/kubernetes-csi/external-snapshotter/bin/csi-snapshotter /usr/bin/
 RUN useradd csi-snapshotter
 USER csi-snapshotter
 ENTRYPOINT ["/usr/bin/csi-snapshotter"]
diff --git a/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7
index d7ff8a2a1..b7b60c8a6 100644
--- a/Dockerfile.openshift.rhel7
+++ b/Dockerfile.openshift.rhel7
@@ -1,10 +1,10 @@
 FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
 WORKDIR /go/src/github.com/kubernetes-csi/external-snapshotter
 COPY . .
-RUN go build ./cmd/csi-snapshotter
+RUN make build
 
 FROM registry.svc.ci.openshift.org/ocp/4.0:base
-COPY --from=builder /go/src/github.com/kubernetes-csi/external-snapshotter/csi-snapshotter /usr/bin/
+COPY --from=builder /go/src/github.com/kubernetes-csi/external-snapshotter/bin/csi-snapshotter /usr/bin/
 RUN useradd csi-snapshotter
 USER csi-snapshotter
 ENTRYPOINT ["/usr/bin/csi-snapshotter"]
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 541a3a51a..dd2eec73f 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -3,6 +3,5 @@ aliases:
     - jsafrane
     - tsmetana
     - gnufied
-    - wongma7
     - childsb
     - bertinatto