diff --git a/validate-ocp-properties.sh b/validate-ocp-properties.sh
index 9f9b070..7ba45a9 100644
--- a/validate-ocp-properties.sh
+++ b/validate-ocp-properties.sh
@@ -11,7 +11,6 @@ FILE_NAME=$6
 PROPERTY_KEY=$7
 PROPERTY_VAL=$8
 
-# OCP login
 oc login $OCP_CLUSTER -u $OCP_LOGIN_USER -p $OCP_LOGIN_PASS > /dev/null
 oc project $OCP_PROJECT > /dev/null
 
@@ -24,6 +23,12 @@ if [[ $FILE_EXTENSION == "properties" ]]; then
   else
     echo "Property not found in $OCP_PROJECT:$FILE_NAME!!\n\033[0;31m$PROPERTY_KEY=\033[0m"
   fi
+elif [[ $FILE_EXTENSION == "yml" ]]; then
+  if [[ $(oc get cm $OCP_CONFIG_MAPS -o json | jq ".data.\"$FILE_NAME\"" -r | yq -N ".$PROPERTY_KEY" | grep -xv null | grep -xc $PROPERTY_VAL) -gt 0 ]]; then
+    echo "Property matched for $OCP_PROJECT:$FILE_NAME!!\n\033[0;32m$PROPERTY_KEY=$PROPERTY_VAL\033[0m"
+  else
+    echo "Property not found in $OCP_PROJECT:$FILE_NAME!!\n\033[0;31m$PROPERTY_KEY=\033[0m"
+  fi
 else
   echo "Cannot yet validate .$FILE_EXTENSION file(s)."
 fi