diff --git a/.github/workflows/aio_integration.yml b/.github/workflows/aio_integration.yml
index e9f8fa2c..b937cde2 100644
--- a/.github/workflows/aio_integration.yml
+++ b/.github/workflows/aio_integration.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version-file: pyproject.toml
           cache: "poetry"
       - name: Set up Node
         uses: actions/setup-node@v4
diff --git a/.github/workflows/aio_sanity_check.yml b/.github/workflows/aio_sanity_check.yml
index a6675640..42647601 100644
--- a/.github/workflows/aio_sanity_check.yml
+++ b/.github/workflows/aio_sanity_check.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version-file: pyproject.toml
           cache: "poetry"
       - name: Set up Node
         uses: actions/setup-node@v4
diff --git a/.github/workflows/consistency_check.yml b/.github/workflows/consistency_check.yml
index ca2a1f3e..d985f29d 100644
--- a/.github/workflows/consistency_check.yml
+++ b/.github/workflows/consistency_check.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version-file: pyproject.toml
       - name: Install dependencies
         run: |
           poetry install -n
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index bf3157a4..e680813a 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version-file: pyproject.toml
           cache: "poetry"
       - name: Set up Node
         uses: actions/setup-node@v4
diff --git a/.github/workflows/on_push.yml b/.github/workflows/on_push.yml
index 8f84cd64..8d62c2da 100644
--- a/.github/workflows/on_push.yml
+++ b/.github/workflows/on_push.yml
@@ -14,11 +14,18 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
         include:
           - version: "3.10"
             check-lint: "true"
+            check-formatting: "true"
+            check-typing: "true"
           - version: "3.11"
             check-lint: "true"
+            check-typing: "true"
+          - version: "3.12"
+            check-lint: "true"
+            check-typing: "true"
     steps:
       - uses: actions/checkout@v4
       - name: Install poetry
@@ -37,12 +44,24 @@ jobs:
         run: |
           poetry run flake8 mypy_boto3_builder
       - name: Formatting
+        if: ${{ matrix.check-formatting }}
         run: |
           poetry run black --check mypy_boto3_builder tests
           poetry run isort -c mypy_boto3_builder tests
       - run: echo "$(poetry env info --path)/bin" >> $GITHUB_PATH
+      - name: Set up Node
+        if: ${{ matrix.check-typing }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+      - name: Install Node.js dependencies
+        if: ${{ matrix.check-typing }}
+        run: |
+          npm install -g pyright
       - name: Typing
-        uses: jakebailey/pyright-action@v1
+        if: ${{ matrix.check-typing }}
+        run: |
+          poetry run npx pyright mypy_boto3_builder
       - name: Test
         run: |
           poetry run pytest
diff --git a/.github/workflows/on_push_coverage.yml b/.github/workflows/on_push_coverage.yml
index 57e0e864..e4612d4e 100644
--- a/.github/workflows/on_push_coverage.yml
+++ b/.github/workflows/on_push_coverage.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version-file: pyproject.toml
           cache: "poetry"
       - name: Install dependencies
         run: |
diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml
index 77597cb2..1b74ebdc 100644
--- a/.github/workflows/on_release.yml
+++ b/.github/workflows/on_release.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version-file: pyproject.toml
       - name: Get version
         id: version
         uses: actions/github-script@v7
diff --git a/.github/workflows/on_release_docs.yml b/.github/workflows/on_release_docs.yml
index fc61bdb1..87495e19 100644
--- a/.github/workflows/on_release_docs.yml
+++ b/.github/workflows/on_release_docs.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version-file: pyproject.toml
       - name: Install project
         run: |
           poetry install -n
diff --git a/.github/workflows/publish_aiobotocore_stubs.yml b/.github/workflows/publish_aiobotocore_stubs.yml
index eb00f282..30d7ad04 100644
--- a/.github/workflows/publish_aiobotocore_stubs.yml
+++ b/.github/workflows/publish_aiobotocore_stubs.yml
@@ -130,7 +130,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version-file: pyproject.toml
       - name: Install builder
         run: |
           rm -rf mypy_boto3_builder
diff --git a/.github/workflows/publish_boto3_stubs.yml b/.github/workflows/publish_boto3_stubs.yml
index 17d6ea06..97cee2f1 100644
--- a/.github/workflows/publish_boto3_stubs.yml
+++ b/.github/workflows/publish_boto3_stubs.yml
@@ -185,7 +185,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version-file: pyproject.toml
       - name: Install boto3
         run: |
           mkdir installtemp
diff --git a/.github/workflows/publish_types_aioboto3.yml b/.github/workflows/publish_types_aioboto3.yml
index 63399ce3..d05d7942 100644
--- a/.github/workflows/publish_types_aioboto3.yml
+++ b/.github/workflows/publish_types_aioboto3.yml
@@ -124,7 +124,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version-file: pyproject.toml
       - name: Install builder
         run: |
           rm -rf mypy_boto3_builder
diff --git a/.github/workflows/sanity_check.yml b/.github/workflows/sanity_check.yml
index f368eb15..152e6593 100644
--- a/.github/workflows/sanity_check.yml
+++ b/.github/workflows/sanity_check.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version-file: pyproject.toml
           cache: "poetry"
       - name: Set up Node
         uses: actions/setup-node@v4