diff --git a/.github/workflows/hydra.yml b/.github/workflows/hydra.yml
index 95faed9c..5e1c0149 100644
--- a/.github/workflows/hydra.yml
+++ b/.github/workflows/hydra.yml
@@ -30,6 +30,7 @@ jobs:
           toolchain: stable
           override: true
           profile: minimal
+          components: rustfmt
 
       - uses: actions/checkout@v3
       - name: Set up Python 3.10.14
@@ -50,3 +51,19 @@ jobs:
         run: |
           source venv/bin/activate
           pytest -n auto
+      - name: Set up Scarb
+        uses: software-mansion/setup-scarb@v1
+        with:
+          scarb-version: "2.8.2"
+      - name: Run make rewrite and check for unstaged changes
+        run: |
+          source venv/bin/activate
+          if ! make rewrite; then
+            echo "Error: 'make rewrite' command failed"
+            exit 1
+          fi
+          if [[ -n $(git status --porcelain) ]]; then
+            echo "Error: Unstaged changes detected after running 'make rewrite'"
+            git status
+            exit 1
+          fi