diff --git a/changes/changelog.d/2121.bugfix b/changes/changelog.d/2121.bugfix
new file mode 100644
index 000000000..b9e9eedc6
--- /dev/null
+++ b/changes/changelog.d/2121.bugfix
@@ -0,0 +1 @@
+Dynamically add report targets to the map to avoid missing keys (#2121)