diff --git a/Dockerfile b/Dockerfile
index b0e065c9a..cc7f6afea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,9 @@ ENV GO_PACKAGE github.com/openshift/cluster-config-operator
 RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" ./cmd/cluster-config-operator
 
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
-RUN mkdir -p /usr/share/bootkube/manifests
-COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/manifests/* /usr/share/bootkube/manifests/
+RUN mkdir -p /usr/share/bootkube/manifests/manifests
+RUN mkdir -p /usr/share/bootkube/manifests/bootstrap-manifests
+COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/manifests/* /usr/share/bootkube/manifests/manifests/
 COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/cluster-config-operator /usr/bin/
 COPY manifests /manifests
 LABEL io.openshift.release.operator true
diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
index f03efbfb5..8160ec9bc 100644
--- a/Dockerfile.rhel7
+++ b/Dockerfile.rhel7
@@ -5,8 +5,9 @@ ENV GO_PACKAGE github.com/openshift/cluster-config-operator
 RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" ./cmd/cluster-config-operator
 
 FROM registry.svc.ci.openshift.org/ocp/4.0:base
-RUN mkdir -p /usr/share/bootkube/manifests
-COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/manifests/* /usr/share/bootkube/manifests/
+RUN mkdir -p /usr/share/bootkube/manifests/manifests
+RUN mkdir -p /usr/share/bootkube/manifests/bootstrap-manifests
+COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/manifests/* /usr/share/bootkube/manifests/manifests/
 COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/cluster-config-operator /usr/bin/
 COPY manifests /manifests
 LABEL io.openshift.release.operator true