diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2d3e91b8..4a7387b5 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -18,20 +18,38 @@ jobs:
       match-path: "test/**/*.sol"
       name: "Unit tests"
 
-  workspace-safe7579:
-    needs: ["build"]
+  lint-safe7579:
+    needs: ["lint", "test-unit"]
+    uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-lint-workspaces.yaml@main"
+    with:
+      match-workspace: "@rhinestone/safe7579"
+
+  test-safe7579:
+    needs: ["build", "test-unit"]
     uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-test-workspaces.yaml@main"
     with:
       match-workspace: "@rhinestone/safe7579"
 
-  workspace-sessionkeymanager:
-    needs: ["build"]
+  lint-sessionkeymanager:
+    needs: ["lint", "test-unit"]
+    uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-lint-workspaces.yaml@main"
+    with:
+      match-workspace: "@rhinestone/sessionkeymanager"
+
+  test-sessionkeymanager:
+    needs: ["build", "test-unit"]
     uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-test-workspaces.yaml@main"
     with:
       match-workspace: "@rhinestone/sessionkeymanager"
 
-  workspace-examples:
-    needs: ["build"]
+  lint-modulekit-examples:
+    needs: ["lint", "test-unit"]
+    uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-lint-workspaces.yaml@main"
+    with:
+      match-workspace: "@rhinestone/modulekit-examples"
+
+  test-modulekit-examples:
+    needs: ["build", "test-unit"]
     uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-test-workspaces.yaml@main"
     with:
       match-workspace: "@rhinestone/modulekit-examples"