diff --git a/changelog/unreleased/config-encode-groups-in-tokens.md b/changelog/unreleased/config-encode-groups-in-tokens.md
new file mode 100644
index 00000000000..a0cad9b049d
--- /dev/null
+++ b/changelog/unreleased/config-encode-groups-in-tokens.md
@@ -0,0 +1,3 @@
+Enhancement: Make encoding user groups in access tokens configurable
+
+https://github.com/cs3org/reva/pull/2085
diff --git a/changelog/unreleased/jwt-token-reduce-size.md b/changelog/unreleased/jwt-token-reduce-size.md
deleted file mode 100644
index 41382aea799..00000000000
--- a/changelog/unreleased/jwt-token-reduce-size.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Enhancement: Don't encode user groups in JWT tokens
-
-https://github.com/cs3org/reva/pull/2085