diff --git a/config/manifests/patches/deployment_patch.yaml b/config/manifests/patches/deployment_patch.yaml
index 27367f08e..fad9a4eca 100644
--- a/config/manifests/patches/deployment_patch.yaml
+++ b/config/manifests/patches/deployment_patch.yaml
@@ -351,4 +351,6 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fd6c9b8ca82ff4f2d0fe29166d1fc9bca6439cb40907be60f4d8f1b9735de2f7
             - name: RELATED_IMAGE_COCKROACH_v25_1_2
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b83eaff2e217c06098509709cead525b55b00ccd48019d8357e6231892008055
+            - name: RELATED_IMAGE_COCKROACH_OPERATOR
+              value: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
           image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
diff --git a/config/templates/deployment_patch.yaml.in b/config/templates/deployment_patch.yaml.in
index 8400c8682..be168eac4 100644
--- a/config/templates/deployment_patch.yaml.in
+++ b/config/templates/deployment_patch.yaml.in
@@ -49,4 +49,6 @@ spec:
             - name: RELATED_IMAGE_COCKROACH_{{ underscore .Tag }}
               value: {{ .RedhatImage }}
 {{- end }}
+            - name: RELATED_IMAGE_COCKROACH_OPERATOR
+              value: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
           image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
diff --git a/hack/bundle.sh b/hack/bundle.sh
index fff9bb123..1ee555ef9 100755
--- a/hack/bundle.sh
+++ b/hack/bundle.sh
@@ -21,6 +21,8 @@ if [[ -z "${BUILD_WORKSPACE_DIRECTORY:-}" ]]; then
   exit 1
 fi
 
+openshift_versions="v4.12-v4.19"
+
 # ensure tool dependencies are on the path
 export PATH="$(pwd)/hack/bin:${PATH}"
 
@@ -76,7 +78,7 @@ generate_bundle() {
 
   # Ensure package name is correct for the specific bundle and that the CSV name matches the package name. Also removing
   # the testing annotations since these are handled automatically upstream. Also add openshift version annotation
-  local openshift_version_annotation="  com.redhat.openshift.versions: v4.8"
+  local openshift_version_annotation="  com.redhat.openshift.versions: ${openshift_versions}"
   sed \
   -e "s+annotations:+annotations:\n  # Minimum Openshift version annotation\n${openshift_version_annotation}+" \
   -e "s/package.v1: cockroach-operator/package.v1: ${pkg}/g" \