diff --git a/docs/development/maintainers.md b/docs/development/maintainers.md
index b4b625e26..c1b8300f5 100644
--- a/docs/development/maintainers.md
+++ b/docs/development/maintainers.md
@@ -20,15 +20,17 @@ the latest release branch named `stable` (due to ReadTheDocs constraints).
 
 2. Set the version in:
 
+   - `src/js/package.json`,
    - `docs/project/about.md` (the Zenodo citation),
    - `docs/development/building-from-sources.md`,
    - `docs/usage/downloading-and-deploying.md`,
-   - `setup.cfg`,
-   - `src/js/package.json`,
-   - `src/py/pyodide/__init__.py`,
-   - `src/py/setup.cfg`,
-   - `pyodide-build/setup.cfg`,
-   - ... other places
+   - Bump version in source code files by running `bump2version` command, for example,
+
+     ```bash
+     bump2version minor
+     ```
+
+     check that the diff is correct with `git diff` before committing.
 
    After this, try using `ripgrep` to make sure there are no extra old versions
    lying around e.g., `rg -F "0.18"`, `rg -F dev0`, `rg -F dev.0`.
diff --git a/requirements.txt b/requirements.txt
index e090be6c9..9c92fa740 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,3 +15,5 @@
   pytest-rerunfailures
   pytest-xdist
   selenium==4.1.0
+  # maintenance
+  bump2version
diff --git a/setup.cfg b/setup.cfg
index 7a6daab4a..896aa2a60 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,22 +19,22 @@ testpaths =
 
 [bumpversion]
 current_version = 0.20.0
-commit = True
-tag = True
+commit = False
+tag = False
 tag_name = {new_version}
 
-[bumpversion:file:src/pyodide.py]
-search = __version__ = '{current_version}'
-replace = __version__ = '{new_version}'
+[bumpversion:file:src/py/pyodide/__init__.py]
+search = __version__ = "{current_version}"
+replace = __version__ = "{new_version}"
 
-[bumpversion:file:Makefile]
-search = iodide.io/v{current_version}
-replace = iodide.io/v{new_version}
+[bumpversion:file:src/py/setup.cfg]
+search = version = {current_version}
+replace = version = {new_version}
 
-[bumpversion:file:docs/pypi.md]
-search = iodide.io/v{current_version}
-replace = iodide.io/v{new_version}
+[bumpversion:file:pyodide-build/setup.cfg]
+search = version = {current_version}
+replace = version = {new_version}
 
-[bumpversion:file:docs/using_pyodide_from_javascript.md]
-search = iodide.io/v{current_version}
-replace = iodide.io/v{new_version}
+[bumpversion:file:run_docker]
+search = PYODIDE_PREBUILT_IMAGE_TAG="{current_version}"
+replace = PYODIDE_PREBUILT_IMAGE_TAG="{new_version}"