diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml
index f1aa48d..c1a553b 100644
--- a/.github/workflows/build-app.yml
+++ b/.github/workflows/build-app.yml
@@ -3,11 +3,21 @@ name: "Build application"
 on:
   push:
     branches: [ main ]
+    paths:
+      - OpenHaystack/**   
   pull_request:
     branches: [ main ]
+    paths:
+      - OpenHaystack/**
+
+env:
+  APP: OpenHaystack
+defaults:
+  run:
+    working-directory: OpenHaystack
 
 jobs:
-  lint-swiftlint:
+  lint-swift:
     runs-on: macos-latest
     steps:
       - name: "Checkout code"
@@ -15,15 +25,32 @@ jobs:
       - name: "Run SwiftLint"
         run: swiftlint --reporter github-actions-logging
 
+  format-swift:
+    runs-on: macos-latest
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v2
+      - name: "Install swift-format"
+        run: brew install swift-format
+      - name: "Run swift-format"
+        run: swift-format --recursive --mode lint .
+
+  format-objc:
+    runs-on: macos-latest
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v2
+      - name: "Install clang-format"
+        run: brew install clang-format
+      - name: "Run clang-format"
+        run: clang-format -n **/*.{h,m}
+
   build-app:
     runs-on: macos-latest
-    needs: lint-swiftlint
-    env:
-      APP: OpenHaystack
-      PROJECT_DIR: OpenHaystack
-    defaults:
-      run:
-        working-directory: ${{ env.PROJECT_DIR }}
+    needs:
+      - lint-swift
+      - format-swift
+      - format-objc
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v2