diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ac43748f..77660305 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -28,27 +28,14 @@ jobs:
       - name: Install Nix
         if: steps.filter.outputs.source_code == 'true'
         uses: DeterminateSystems/nix-installer-action@main
-
-      - name: Format check
-        if: steps.filter.outputs.source_code == 'true'
-        run: nix develop .#ci -c bash -c "make fmt && git diff --exit-code"
-
-      - name: Check
-        if: steps.filter.outputs.source_code == 'true'
-        run: nix develop .#ci -c make check
-
-      - name: Sql check
-        if: steps.filter.outputs.source_code == 'true'
-        run: nix develop .#ci -c make check-sql
-
-      - name: Build
-        if: steps.filter.outputs.source_code == 'true'
-        run: nix develop .#ci -c make build
-
-      - name: Generated files check
-        if: steps.filter.outputs.source_code == 'true'
-        run: nix develop .#ci -c bash -c "make generate && git diff --exit-code"
-
-      - name: Test
-        if: steps.filter.outputs.source_code == 'true'
-        run: nix develop .#ci -c make test
+        
+      - name: CI
+        run: |
+          nix develop .#ci --command bash -c '
+            make fmt && git diff --exit-code
+            make check
+            make check-sql
+            make build
+            make generate && git diff --exit-code
+            make test
+          '
diff --git a/Makefile b/Makefile
index e8fcedae..273c87e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 .DEFAULT_GOAL := build
 
+
 BIN_DIR := bin
 API_NAME := acmcsuf-api
 CLI_NAME := acmcsuf-cli