diff --git a/docs/source/troubleshooting/purging_old_data.rst b/docs/source/troubleshooting/purging_old_data.rst
index f638c90f..336e8599 100644
--- a/docs/source/troubleshooting/purging_old_data.rst
+++ b/docs/source/troubleshooting/purging_old_data.rst
@@ -27,10 +27,13 @@ as shown below:
     action_executions_ttl = 30
     action_executions_output_ttl = 10
     trigger_instances_ttl = 40
+    traces_ttl = 20
+    rule_enforcements_ttl = 25
 
 In this case, action executions older than 30 days, action execution output
-objects older than 10 days and trigger instances older than 40 days will be
-automatically deleted.
+objects older than 10 days, trigger instances older than 40 days, trace
+objects older than 20 days and rule enforcement objects older than 25 days
+will be automatically deleted.
 
 The lowest supported TTL is 7 days. If you need to delete old data more frequently, check the
 manual purge scripts below.
diff --git a/docs/source/upgrade_notes.rst b/docs/source/upgrade_notes.rst
index cdb0c80a..ed0e4c62 100644
--- a/docs/source/upgrade_notes.rst
+++ b/docs/source/upgrade_notes.rst
@@ -29,6 +29,11 @@ Upgrade Notes
 
 * On RockyLinux/CentOS/RHEL 8 the ST2 python version has changed from python 3.6 to python 3.8.
 
+* Additional garbage collection options are available to automatically delete rule enforcement,
+  and trace instances.
+  See :doc:`purging old data documentation <troubleshooting/purging_old_data>` for further
+  information.
+
 .. _ref-upgrade-notes-v3-6:
 
 |st2| v3.6