diff --git a/.ci/cico_olm_prcheck.sh b/.ci/cico_olm_prcheck.sh
index b144b1745..bdae0411e 100644
--- a/.ci/cico_olm_prcheck.sh
+++ b/.ci/cico_olm_prcheck.sh
@@ -15,6 +15,8 @@ trap 'Catch_Finish $?' EXIT SIGINT
 # Catch errors and force to delete minikube VM.
 Catch_Finish() {
   rm -rf ~/.kube && yes | minikube delete
+  printInfo "http://artifacts.ci.centos.org/devtools/che/che-operator-olm-pr-check/report/"
+  archiveArtifacts "che-operator-olm-pr-check"
 }
 
 init() {
diff --git a/olm/eclipse-che-preview-kubernetes/Dockerfile b/olm/eclipse-che-preview-kubernetes/Dockerfile
index 99cba0565..4dc1086e8 100644
--- a/olm/eclipse-che-preview-kubernetes/Dockerfile
+++ b/olm/eclipse-che-preview-kubernetes/Dockerfile
@@ -3,10 +3,15 @@ FROM quay.io/operator-framework/upstream-registry-builder as builder
 COPY deploy manifests/eclipse-che-preview-kubernetes
 RUN ./bin/initializer -o ./bundles.db
 
-FROM scratch
+FROM openshift/origin-base
+
+COPY --from=builder /build/bin/initializer /initializer
+COPY --from=builder /build/bin/configmap-server /bin/configmap-server
 COPY --from=builder /build/bundles.db /bundles.db
 COPY --from=builder /build/bin/registry-server /registry-server
 COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe
+
 EXPOSE 50051
+
 ENTRYPOINT ["/registry-server"]
 CMD ["--database", "bundles.db"]
diff --git a/olm/eclipse-che-preview-openshift/Dockerfile b/olm/eclipse-che-preview-openshift/Dockerfile
index 6f8d9061d..b24daace1 100644
--- a/olm/eclipse-che-preview-openshift/Dockerfile
+++ b/olm/eclipse-che-preview-openshift/Dockerfile
@@ -2,7 +2,10 @@ FROM quay.io/operator-framework/upstream-registry-builder as builder
 COPY deploy manifests/eclipse-che-preview-openshift
 RUN ./bin/initializer -o ./bundles.db
 
-FROM scratch
+FROM openshift/origin-base
+
+COPY --from=builder /build/bin/initializer /initializer
+COPY --from=builder /build/bin/configmap-server /bin/configmap-server
 COPY --from=builder /build/bundles.db /bundles.db
 COPY --from=builder /build/bin/registry-server /registry-server
 COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe