diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
index 5b30f74555a2a2..e99b47a242f3c2 100644
--- a/.github/workflows/chef.yaml
+++ b/.github/workflows/chef.yaml
@@ -91,6 +91,8 @@ jobs:
             - name: Bootstrap
               timeout-minutes: 10
               run: scripts/build/gn_bootstrap.sh
+            - name: Fixup GdbGui requirement
+              run: perl -i -pe 's/^gdbgui==/# gdbgui==/' /opt/espressif/esp-idf/requirements.txt
             - name: CI Examples ESP32
               shell: bash
               run: |
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index 2496ff101b0bd0..f84ec9205bcba6 100644
--- a/.github/workflows/examples-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -51,6 +51,9 @@ jobs:
             - name: Checkout submodules
               run: scripts/checkout_submodules.py --allow-changing-global-git-config --shallow --platform esp32
 
+            - name: Fixup GdbGui requirement
+              run: perl -i -pe 's/^gdbgui==/# gdbgui==/' /opt/espressif/esp-idf/requirements.txt
+
             - name: Set up environment for size reports
               if: ${{ !env.ACT }}
               env:
@@ -196,6 +199,9 @@ jobs:
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
 
+            - name: Fixup GdbGui requirement
+              run: perl -i -pe 's/^gdbgui==/# gdbgui==/' /opt/espressif/esp-idf/requirements.txt
+
             - name: Build example Bridge App
               timeout-minutes: 15
               run: scripts/examples/esp_example.sh bridge-app
diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
index 79bf9d5c4964ff..0bbd993254058a 100644
--- a/.github/workflows/qemu.yaml
+++ b/.github/workflows/qemu.yaml
@@ -75,6 +75,9 @@ jobs:
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
 
+            - name: Fixup GdbGui requirement
+              run: perl -i -pe 's/^gdbgui==/# gdbgui==/' /opt/espressif/esp-idf/requirements.txt
+
             - name: Build ESP32 QEMU test images
               timeout-minutes: 20
               run: |
diff --git a/scripts/setup/requirements.esp32.txt b/scripts/setup/requirements.esp32.txt
index 6fbd9d1e29444d..7c4eac1cb7e161 100644
--- a/scripts/setup/requirements.esp32.txt
+++ b/scripts/setup/requirements.esp32.txt
@@ -9,4 +9,10 @@ ecdsa>=0.16.0
 kconfiglib==13.7.1
 construct==2.10.54
 python-socketio<5
-gdbgui==0.13.2.0 ; python_version < "3.11" and platform_machine != 'aarch64' and sys_platform == 'linux'
+itsdangerous<2.1 ; python_version < "3.11"
+#
+# gdbgui pulls in gevent which fails to compile due to cython updates.
+# Could not find a good way to fix this dependency, so commenting it
+# out here.
+#
+# gdbgui==0.13.2.0 ; python_version < "3.11" and platform_machine != 'aarch64' and sys_platform == 'linux'