diff --git a/categories_map.py b/categories_map.py
index f9002d08845b..145bf6387a27 100644
--- a/categories_map.py
+++ b/categories_map.py
@@ -1791,7 +1791,10 @@
 # Format: label = [regexp1, regexp2]
 # where regexpX can be part of cmssw package e.g SiStrip will match all cmssw packages with SiStrip in them
 # "jetmet": [ "SubSystem1/", "SubSystem2/Package"]
+import re
+
 CMSSW_LABELS = {
+    "changes-dataformats": [re.compile("^.+/src/classes_def(.+|).xml$")],
     "trk": [
         "Alignment/APEEstimation",
         "Alignment/HIPAlignmentAlgorithm",
diff --git a/process_pr.py b/process_pr.py
index 9b16a70f80d7..5a48e05e4c31 100644
--- a/process_pr.py
+++ b/process_pr.py
@@ -204,7 +204,7 @@ def update_CMSSW_LABELS(repo_config):
         check_dpg_pog = False
     dpg_pog = {} if not check_dpg_pog else get_dpg_pog()
     for l in CMSSW_LABELS.keys():
-        if check_dpg_pog and (not l in dpg_pog):
+        if check_dpg_pog and (not l in dpg_pog) and (not l in TYPE_COMMANDS):
             del CMSSW_LABELS[l]
         else:
             CMSSW_LABELS[l] = [