diff --git a/changelog/1121.removal.rst b/changelog/1121.removal.rst
new file mode 100644
index 00000000..36c5dd10
--- /dev/null
+++ b/changelog/1121.removal.rst
@@ -0,0 +1 @@
+Username for PyPI and Test PyPI now defaults to __token__ but no longer overrides a username configured in the environment or supplied on the command line. Workflows still supplying anything other than __token__ for the username when uploading to PyPI or Test PyPI will now fail. Either supply __token__ or do not supply a username at all.
\ No newline at end of file