diff --git a/.github/workflows/lints.yaml b/.github/workflows/ci.yaml
similarity index 82%
rename from .github/workflows/lints.yaml
rename to .github/workflows/ci.yaml
index 00781bc2..f64f6b38 100644
--- a/.github/workflows/lints.yaml
+++ b/.github/workflows/ci.yaml
@@ -7,11 +7,12 @@ on:
     branches: [ main, develop ]
 
 jobs:
-  clippy:
+  lint:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         component: [near]
+        check: [clippy, fmt]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -20,13 +21,13 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           toolchain: 1.79.0
-          components: clippy
+          components: clippy, rustfmt
           target: wasm32-unknown-unknown
           override: true
 
-      - name: Run Clippy
+      - name: Run ${{ matrix.check }}
         run: |
-          make rust-lint-${{ matrix.component }}
+          make ${{ matrix.check }}-${{ matrix.component }}
 
   build:
     runs-on: ubuntu-latest
diff --git a/Makefile b/Makefile
index f208b11c..dea559ca 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,18 @@ RUSTFLAGS = -C link-arg=-s
 NEAR_MANIFEST = ./near/Cargo.toml
 OMNI_RELAYER_MANIFEST = ./omni-relayer/Cargo.toml
 
-rust-lint: rust-lint-near #rust-lint-relayer
+clippy: clippy-near #clippy-relayer
 
-rust-lint-near:
+clippy-near:
 	cargo clippy --manifest-path $(NEAR_MANIFEST) -- $(LINT_OPTIONS)
 
-rust-lint-omni-relayer:
+fmt-near:
+	cargo fmt --all --check --manifest-path $(NEAR_MANIFEST)
+
+fmt-omni-relayer:
+	cargo fmt --all --check --manifest-path $(OMNI_RELAYER_MANIFEST)
+
+clippy-omni-relayer:
 	cargo clippy --manifest-path $(OMNI_RELAYER_MANIFEST) -- $(LINT_OPTIONS)
 
 rust-build-near: