diff --git a/.github/workflows/commitlint.yaml b/.github/workflows/commitlint.yaml
index b6bf0180b8..b61a54c816 100644
--- a/.github/workflows/commitlint.yaml
+++ b/.github/workflows/commitlint.yaml
@@ -22,7 +22,7 @@ jobs:
         - name: Install Dependencies
           run: |
             python -m pip install --upgrade pip
-            pip install .[dev]
+            pip install -r cz-requirement.txt
 
         - name: Check commit history
           run: cz check --rev-range $(git rev-list --all --reverse | head -1)..HEAD
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index 2cc041d56e..56ba57424f 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -23,6 +23,10 @@ jobs:
         - name: Install Dependencies
           run: |
             python -m pip install --upgrade pip
+
+            # TODO: Remove once we have re-added Myst-Parser to setup.py (post sphinx 6 support)
+            pip install git+https://github.com/executablebooks/MyST-Parser.git
+
             pip install .[doc]
 
         - name: Build HTML artifact
diff --git a/.github/workflows/prtitle.yaml b/.github/workflows/prtitle.yaml
index defdb80ee8..70bcb37641 100644
--- a/.github/workflows/prtitle.yaml
+++ b/.github/workflows/prtitle.yaml
@@ -22,7 +22,7 @@ jobs:
         - name: Install Dependencies
           run: |
             python -m pip install --upgrade pip
-            pip install .[dev]
+            pip install -r cz-requirement.txt
 
         - name: Check PR Title
           env:
diff --git a/cz-requirement.txt b/cz-requirement.txt
new file mode 100644
index 0000000000..0933570909
--- /dev/null
+++ b/cz-requirement.txt
@@ -0,0 +1 @@
+commitizen>=2.40,<2.41
diff --git a/setup.py b/setup.py
index e5fcfbb877..bb39beab05 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@
     ],
     "doc": [
         # Tools for parsing markdown files in the docs
-        "myst-parser @ git+https://github.com/executablebooks/MyST-Parser.git",
+        # "myst-parser",  # TODO: Uncomment/re-pin once Sphinx 6 support is released
         "sphinx-click>=4.4.0,<5.0",  # For documenting CLI
         "Sphinx>=6.1.3,<7.0",  # Documentation generator
         "sphinx_rtd_theme>=1.2.0rc3,<2",  # Readthedocs.org theme
@@ -47,7 +47,8 @@
         "twine==3.8.0",  # Package upload tool
     ],
     "dev": [
-        "commitizen>=2.19,<2.20",  # Manage commits and publishing releases
+        # commitizen: Manage commits and publishing releases
+        (here / "cz-requirement.txt").read_text().strip(),
         "pre-commit",  # Ensure that linters are run prior to committing
         "pytest-watch",  # `ptw` test watcher/runner
         "ipdb",  # Debugger (Must use `export PYTHONBREAKPOINT=ipdb.set_trace`)
@@ -55,7 +56,7 @@
     # NOTE: These are extras that someone can install to get up and running quickly w/ ape
     #       They should be kept up to date with what works and what doesn't out of the box
     #       Usage example: `pipx install eth-ape[recommended-plugins]`
-    "recommended-plugins": (here / "recommended-plugins.txt").read_text().split("\n"),
+    "recommended-plugins": (here / "recommended-plugins.txt").read_text().splitlines(),
 }
 
 # NOTE: `pip install -e .[dev]` to install package