diff --git a/.github/workflows/pre_commit_check.yml b/.github/workflows/pre_commit_check.yml
new file mode 100644
index 0000000000..51dfea32fa
--- /dev/null
+++ b/.github/workflows/pre_commit_check.yml
@@ -0,0 +1,33 @@
+name: Check pre-commit rules
+
+on:
+  pull_request:
+
+jobs:
+  pre_commit_check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Fetch head and base refs
+        # This is necessary for pre-commit to check the changes in the PR branch
+        run: |
+          git fetch origin ${GITHUB_BASE_REF}
+          git fetch origin ${GITHUB_HEAD_REF}
+      - name: Set up Python environment
+        uses: actions/setup-python@master
+        with:
+          python-version: v3.7
+      - name: Install python packages
+        run: |
+          pip install pre-commit
+          pre-commit install-hooks
+      - name: Run pre-commit and check for any changes
+        run: |
+          if ! pre-commit run --from-ref "origin/${GITHUB_BASE_REF}" --to-ref "origin/${GITHUB_HEAD_REF}" --show-diff-on-failure ; then
+            echo ""
+            echo "::notice::It looks like the commits in this PR have been made without having pre-commit hooks installed."
+            echo "::notice::Please see https://docs.espressif.com/projects/esp-idf/en/latest/esp32/contribute/install-pre-commit-hook.html for instructions."
+            echo ""
+            exit 1
+          fi
diff --git a/.github/workflows/python_lint.yml b/.github/workflows/python_lint.yml
deleted file mode 100644
index 65317223d3..0000000000
--- a/.github/workflows/python_lint.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Python CI
-
-# This workflow will be triggered when a PR modifies some python relevant files
-on:
-  pull_request:
-    paths:
-      - "**.py"
-
-jobs:
-  python_lint:
-    name: python lint
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@master
-      - name: Set up Python environment
-        uses: actions/setup-python@master
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Lint with flake8
-        run: |
-          pip install flake8
-          flake8 . --config=.flake8 --benchmark