diff --git a/.github/workflows/build_and_push_image.yaml b/.github/workflows/build_and_push_image.yaml
index 4c7328e..35477f5 100644
--- a/.github/workflows/build_and_push_image.yaml
+++ b/.github/workflows/build_and_push_image.yaml
@@ -1,3 +1,4 @@
+---
 name: Build and push image
 on:
   push:
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
new file mode 100644
index 0000000..9f346af
--- /dev/null
+++ b/.github/workflows/lint.yaml
@@ -0,0 +1,32 @@
+---
+name: Linters
+'on':
+  pull_request:
+    branches:
+      - main
+    types:
+      - opened
+      - reopened
+      - synchronize
+jobs:
+  yamllint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run yamllint
+        uses: frenck/action-yamllint@v1
+  gitlint:
+    name: Run gitlint checks
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ref: '${{ github.event.pull_request.head.sha }}'
+      - name: Install gitlint into container
+        run: python -m pip install gitlint
+      - name: Run gitlint check
+        run: >-
+          gitlint --commits origin/${{ github.event.pull_request.base.ref
+          }}..HEAD
diff --git a/.github/workflows/python.yaml b/.github/workflows/python.yaml
index 1c6d925..28ea1b2 100644
--- a/.github/workflows/python.yaml
+++ b/.github/workflows/python.yaml
@@ -1,3 +1,4 @@
+---
 name: Python Checks for Pull Requests
 on:
   pull_request:
@@ -16,7 +17,7 @@ jobs:
       - name: Setup python environment for flake8 check
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9" # Same as in Dockerfile
+          python-version: "3.9"  # Same as in Dockerfile
       - name: flake8 Lint
         uses: py-actions/flake8@v2
       - name: Run pytest