diff --git a/releasenotes/notes/undercloud_cleanup-e52612bfd2ff4148.yaml b/releasenotes/notes/undercloud_cleanup-e52612bfd2ff4148.yaml
index ea5cee1df..b4c9ca42f 100644
--- a/releasenotes/notes/undercloud_cleanup-e52612bfd2ff4148.yaml
+++ b/releasenotes/notes/undercloud_cleanup-e52612bfd2ff4148.yaml
@@ -4,3 +4,4 @@ features:
     The new option "upgrade_cleanup" is set to False by default but when
     set to True, it'll cleanup the packages and configurations installed
     on the undercloud after an upgrade.
+    This feature is experimental now and should be used for testing only.
diff --git a/tripleoclient/config/undercloud.py b/tripleoclient/config/undercloud.py
index 3601aefe8..5898535d5 100644
--- a/tripleoclient/config/undercloud.py
+++ b/tripleoclient/config/undercloud.py
@@ -284,8 +284,9 @@ class UndercloudConfig(StandaloneConfig):
             cfg.BoolOpt('upgrade_cleanup',
                         default=False,
                         help=_(
-                            'Whether to clean undercloud rpms after an upgrade'
-                            ' to a containerized undercloud.')),
+                            '(Experimental) Whether to clean undercloud rpms '
+                            'after an upgrade to a containerized '
+                            'undercloud.')),
             cfg.ListOpt('enabled_hardware_types',
                         default=['ipmi', 'redfish', 'ilo', 'idrac'],
                         help=_('List of enabled bare metal hardware types '