diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2799facd2..edcdda7f8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -68,29 +68,6 @@ jobs:
       - name: Run test
         run: ${{ matrix.task }}
 
-  check-typos:
-    runs-on: ubuntu-latest
-    container:
-      image: quay.io/fedora/fedora:43  # CURRENT DEVELOPMENT ENVIRONMENT
-    steps:
-      - name: Install dependencies
-        run: >
-          dnf install -y
-          clang
-          glibc-static
-          make
-      - uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          components: cargo
-      - uses: baptiste0928/cargo-install@v3
-        with:
-          crate: typos-cli
-      - name: Run test
-        run: make -f Makefile check-typos
-
   test-runs:
     strategy:
       matrix:
@@ -255,3 +232,8 @@ jobs:
       - name: Run coverage report
         run: make -f Makefile coverage-report
         working-directory: stratis-cli
+
+  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/.github/workflows/support.yml b/.github/workflows/support.yml
deleted file mode 100644
index 1e5120c27..000000000
--- a/.github/workflows/support.yml
+++ /dev/null
@@ -1,50 +0,0 @@
----
-name: stratis-cli CI for support code
-
-on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - 'CHANGES.txt'
-      - '**/README.rst'
-      - 'LICENSE'
-      - 'docs/**'
-      - 'shell-completion/**'
-  pull_request:
-    branches:
-      - master
-    paths-ignore:
-      - 'CHANGES.txt'
-      - '**/README.rst'
-      - 'LICENSE'
-      - 'docs/**'
-      - 'shell-completion/**'
-
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  python-checks:
-    strategy:
-      matrix:
-        include:
-          - dependencies: yamllint
-            task: make -f Makefile yamllint
-    runs-on: ubuntu-latest
-    container:
-      image: quay.io/fedora/fedora:43  # CURRENT DEVELOPMENT ENVIRONMENT
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-      - name: Install dependencies
-        run: >
-          dnf install -y
-          make
-          ${{ matrix.dependencies }}
-      - name: Run test
-        run: ${{ matrix.task }}
diff --git a/Makefile b/Makefile
index 0440d23d8..a507a0b71 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,10 @@ fmt-ci:
 check-typos:
 	typos
 
+.PHONY: fix-typos
+fix-typos:
+	typos -w
+
 PYREVERSE_OPTS = --output=pdf
 .PHONY: view
 view: