diff --git a/component_versions.env b/component_versions.env
index 3b6dabe3..0df9e6e9 100644
--- a/component_versions.env
+++ b/component_versions.env
@@ -64,7 +64,9 @@ PUSHGATEWAY_CHART_VERSION=3.4.0
 PUSHGATEWAY_FULL_IMAGE="quay.io/prometheus/pushgateway:v1.11.1"
 
 #Prometheus Operator CRD
-PROM_OPERATOR_CRD_VERSION=v0.81.0
+##NOTE: PROM_OPERATOR_CRD_VERSION is now automatically
+##      set to match the Prometheus Operator version.
+##      However, it can still be set explicitly if need be.
 
 #Tempo
 TEMPO_CHART_REPO=grafana
diff --git a/monitoring/bin/deploy_monitoring_cluster.sh b/monitoring/bin/deploy_monitoring_cluster.sh
index be1e11d7..42dcc529 100755
--- a/monitoring/bin/deploy_monitoring_cluster.sh
+++ b/monitoring/bin/deploy_monitoring_cluster.sh
@@ -78,6 +78,12 @@ fi
 
 #Generate yaml file with all container-related keys
 generateImageKeysFile "$PROMOP_FULL_IMAGE" "monitoring/prom-operator_container_image.template"
+if [ -z "$PROM_OPERATOR_CRD_VERSION" ]; then
+    log_debug "Setting PROM_OPERATOR_CRD_VERSION based on version [$VERSION] extracted from PROMOP_FULL_IMAGE"
+    PROM_OPERATOR_CRD_VERSION="$VERSION"
+else
+    log_info "PROM_OPERATOR_CRD_VERSION has been explicitly set to [$PROM_OPERATOR_CRD_VERSION]"
+fi
 generateImageKeysFile "$ALERTMANAGER_FULL_IMAGE" "$imageKeysFile" "ALERTMANAGER_"
 generateImageKeysFile "$ADMWEBHOOK_FULL_IMAGE" "$imageKeysFile" "ADMWEBHOOK_"
 generateImageKeysFile "$KSM_FULL_IMAGE" "$imageKeysFile" "KSM_"