diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6b2092ae..2725258a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,6 @@ on:
       - 'CHANGES.txt'
       - '**/README.md'
 
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 jobs:
@@ -51,23 +50,6 @@ jobs:
           sudo apt-get install libcryptsetup-dev
       - name: Test linting on CURRENT DEVELOPMENT RUST TOOLCHAIN
         run: make -f Makefile $TASK
-  typos:
-    env:
-      TASK: check-typos
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Install git
-        run: sudo apt-get install git
-      - uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-      - uses: baptiste0928/cargo-install@v3
-        with:
-          crate: typos-cli
-      - name: Test typos on CURRENT DEVELOPMENT RUST TOOLCHAIN
-        run: make -f Makefile $TASK
-
 
   stable:
     strategy:
@@ -242,17 +224,7 @@ jobs:
       - name: Test ${{ matrix.task }} on LOWEST SUPPORTED RUST TOOLCHAIN
         run: ${{ matrix.task }}
 
-  # VERIFICATION OF TEST INFRASTRUCTURE
-  yamllint:
-    runs-on: ubuntu-22.04
-    container: fedora:43  # CURRENT DEVELOPMENT ENVIRONMENT
-    steps:
-      - name: Install git
-        run: dnf install -y git
-      - uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-      - name: Install dependencies
-        run: dnf install -y make yamllint
-      - name: Run yamllint
-        run: make -f Makefile yamllint
+  general_checks:
+    uses: stratis-storage/github-actions/.github/workflows/reusable_general.yml@master
+    with:
+      fedora-container-image-number: 43  # CURRENT DEVELOPMENT ENVIRONMENT
diff --git a/Makefile b/Makefile
index 96ff8df8..f808ef10 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,9 @@ audit:
 check-typos:
 	typos
 
+fix-typos:
+	typos -w
+
 build:
 	cargo ${BUILD}
 
@@ -79,6 +82,7 @@ yamllint:
 	clippy
 	docs-rust
 	docs-ci
+	fix-typos
 	fmt
 	fmt-ci
 	release