diff --git a/mapfile.csv b/mapfile.csv
index 372d4d3c..c2c7b6cb 100644
--- a/mapfile.csv
+++ b/mapfile.csv
@@ -250,9 +250,9 @@ GenuineIntel-6-DD,V1.04,/CWF/events/clearwaterforest_core.json,core,,,
 GenuineIntel-6-DD,V1.04,/CWF/events/clearwaterforest_uncore.json,uncore,,,
 GenuineIntel-6-DD,V1.04,/CWF/events/clearwaterforest_uncore_experimental.json,uncore experimental,,,
 GenuineIntel-6-DD,V1.0,/CWF/metrics/clearwaterforest_metrics.json,metrics,,,
-GenuineIntel-18-01,V1.00,/NVL/events/novalake_arcticwolf_core.json,hybridcore,0x20,0x000005,Atom
-GenuineIntel-18-01,V1.00,/NVL/events/novalake_coyotecove_core.json,hybridcore,0x40,0x000005,Core
-GenuineIntel-18-01,V1.00,/NVL/events/novalake_uncore.json,uncore,,,
-GenuineIntel-18-03,V1.00,/NVL/events/novalake_arcticwolf_core.json,hybridcore,0x20,0x000005,Atom
-GenuineIntel-18-03,V1.00,/NVL/events/novalake_coyotecove_core.json,hybridcore,0x40,0x000005,Core
-GenuineIntel-18-03,V1.00,/NVL/events/novalake_uncore.json,uncore,,,
+GenuineIntel-18-1,V1.00,/NVL/events/novalake_arcticwolf_core.json,hybridcore,0x20,0x000005,Atom
+GenuineIntel-18-1,V1.00,/NVL/events/novalake_coyotecove_core.json,hybridcore,0x40,0x000005,Core
+GenuineIntel-18-1,V1.00,/NVL/events/novalake_uncore.json,uncore,,,
+GenuineIntel-18-3,V1.00,/NVL/events/novalake_arcticwolf_core.json,hybridcore,0x20,0x000005,Atom
+GenuineIntel-18-3,V1.00,/NVL/events/novalake_coyotecove_core.json,hybridcore,0x40,0x000005,Core
+GenuineIntel-18-3,V1.00,/NVL/events/novalake_uncore.json,uncore,,,
diff --git a/scripts/ci/verify_mapfile/mapfile_schema.json b/scripts/ci/verify_mapfile/mapfile_schema.json
index 1ca9bb35..2e3bfea4 100644
--- a/scripts/ci/verify_mapfile/mapfile_schema.json
+++ b/scripts/ci/verify_mapfile/mapfile_schema.json
@@ -8,7 +8,7 @@
         "properties" : {
             "Family-model" : {
                 "type": "string",
-                "pattern": "^GenuineIntel-(6|18)-[A-F0-9]{2}(-\\[[A-F0-9]+\\])?$"
+                "pattern": "^GenuineIntel-(6|18)-[A-F0-9]{1,2}(-\\[[A-F0-9]+\\])?$"
             },
             "Version" : {
                 "type": "string",