diff --git a/changelog.d/11209.docker b/changelog.d/11209.docker
new file mode 100644
index 000000000000..838b165ac9de
--- /dev/null
+++ b/changelog.d/11209.docker
@@ -0,0 +1 @@
+Avoid changing userid when started as a non-root user, and no explicit `UID` is set.