diff --git a/.github/workflows/Lint.yml b/.github/workflows/Lint.yml
deleted file mode 100644
index ffc12ef21..000000000
--- a/.github/workflows/Lint.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# name: Lint
-
-# on: [pull_request]
-
-# jobs:
-#   eslint:
-#     name: Run eslint
-#     runs-on: ubuntu-latest
-
-#     steps:
-#       - name: Check out Git repository
-#         uses: actions/checkout@v2
-
-#       - name: Set up Node.js
-#         uses: actions/setup-node@v1
-#         with:
-#           node-version: 12
-
-#       # ESLint and Prettier must be in `package.json`
-#       - name: Install Node.js dependencies
-#         run: npm install
-
-#       - name: Run linters
-#         uses: samuelmeuli/lint-action@v1
-#         with:
-#           github_token: ${{ secrets.github_token }}
-#           # Enable linters
-#           eslint: true
-#           eslint_extensions: ts,tsx
diff --git a/.github/workflows/Main.yaml b/.github/workflows/Main.yaml
index 7eb89ed50..8d6528734 100644
--- a/.github/workflows/Main.yaml
+++ b/.github/workflows/Main.yaml
@@ -2,22 +2,39 @@ name: CI
 
 on: [pull_request]
 
+permissions:
+  contents: read
+  pull-requests: read
+
+env:
+  CODE_DIR: src
+
 jobs:
+  helm-lint:
+    name: Run Helm lint Check
+    runs-on: ubuntu-latest
+    steps:
+      - name: helm-lint
+        uses: MapColonies/shared-workflows/actions/helm-lint@helm-lint-v1
+
   build_and_test:
     runs-on: ubuntu-latest
+    permissions:
+      checks: write
+      contents: write
     strategy:
       matrix:
         os: [ubuntu-latest]
         node-version: [16.13.x]
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - uses: actions/cache@v4
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install yarn
@@ -26,11 +43,16 @@ jobs:
           echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
           sudo apt-get update
           sudo apt-get install --no-install-recommends yarn
-
       - name: Install dependecies
         run: yarn
       - name: Lint
-        run: yarn run eslint:check
+        uses: wearerequired/lint-action@v2
+        with:
+          tsc: true
+          eslint: true
+          eslint_extensions: js,jsx,ts,tsx
+          prettier: true
+          prettier_dir: ${{ env.CODE_DIR }}
       - name: Test
         run: yarn test