diff --git a/debian/scripts/misc/kconfig/annotations.py b/debian/scripts/misc/kconfig/annotations.py
index 1d5e40cb67de..e9bd5e03ead5 100644
--- a/debian/scripts/misc/kconfig/annotations.py
+++ b/debian/scripts/misc/kconfig/annotations.py
@@ -213,6 +213,7 @@ class Annotation(Config):
                 configs = {**configs, **self.search_config(arch=arch, flavour=flavour).keys()}
 
         # Import configs from the Kconfig object into Annotations
+        flavour_arg = flavour
         if flavour is not None:
             flavour = arch + f'-{flavour}'
         else:
@@ -224,6 +225,14 @@ class Annotation(Config):
                 val = '-'
             if conf in self.config:
                 if 'policy' in self.config[conf]:
+                    # Add a TODO if a config with a note is changing and print
+                    # a warning
+                    old_val = self.search_config(config=conf, arch=arch, flavour=flavour_arg)
+                    if old_val:
+                        old_val = old_val[conf]
+                    if val != old_val and "note" in self.config[conf]:
+                        self.config[conf]['note'] = "TODO: update note"
+                        print(f"WARNING: {conf} changed from {old_val} to {val}, updating note")
                     self.config[conf]['policy'][flavour] = val
                 else:
                     self.config[conf]['policy'] = {flavour: val}