diff --git a/build/build_opm_catalog.sh b/build/build_opm_catalog.sh
index 8754405d..990234e3 100755
--- a/build/build_opm_catalog.sh
+++ b/build/build_opm_catalog.sh
@@ -140,11 +140,12 @@ function validate_opm_bundle() {
 
 function build_opm_catalog() {
     log "Updating the catalog index"
-    mkdir olm/deployment-validation-operator-index
+    mkdir olm/catalog
 
-    ${COMMAND_OPM} render ${OLM_BUNDLE_IMAGE_VERSION} -o yaml >> olm/deployment-validation-operator-index/catalog.yaml
+    ${COMMAND_OPM} generate dockerfile olm/catalog
+    ${COMMAND_OPM} render ${OLM_BUNDLE_IMAGE_VERSION} -o yaml >> olm/catalog/index.yaml
 
-    cat << EOF >> olm/deployment-validation-operator-index/catalog.yaml
+    cat << EOF >> olm/catalog/index.yaml
 ---
 defaultChannel: alpha
 name: deployment-validation-operator
@@ -158,10 +159,10 @@ entries:
   skipRange: ">=0.0.1 <${OPERATOR_VERSION}"
 EOF
 
-    cat olm/deployment-validation-operator-index/catalog.yaml
+    cat olm/catalog/index.yaml
         
     log "Validating the catalog"
-    ${COMMAND_OPM} validate olm/deployment-validation-operator-index
+    ${COMMAND_OPM} validate olm/catalog
 
     log "Building the catalog image"
     ${CONTAINER_ENGINE} build -f olm/catalog.Dockerfile -t ${OLM_CATALOG_IMAGE_VERSION}
diff --git a/olm/catalog.Dockerfile b/olm/catalog.Dockerfile
deleted file mode 100644
index 5e0335b7..00000000
--- a/olm/catalog.Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-# The builder image is expected to contain
-# /bin/opm (with serve subcommand)
-FROM quay.io/operator-framework/opm:latest
-
-# Configure the entrypoint and command
-ENTRYPOINT ["/bin/opm"]
-CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
-
-# Copy FBC root into image at /configs and pre-populate serve cache
-ADD deployment-validation-operator-index /configs
-
-# Set FBC-specific label for the location of the FBC root directory
-# in the image
-LABEL operators.operatorframework.io.index.configs.v1=/configs